Skip to content

Commit

Permalink
Merge pull request #2794 from terrelln/spdx-license
Browse files Browse the repository at this point in the history
[contrib][linux] Fix up SPDX license identifiers
  • Loading branch information
terrelln committed Sep 23, 2021
2 parents 441eb26 + 4d347a9 commit b25d574
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion contrib/linux-kernel/decompress_sources.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
/*
* Copyright (c) Facebook, Inc.
* All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion contrib/linux-kernel/linux.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
# ################################################################
# Copyright (c) Facebook, Inc.
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion contrib/linux-kernel/linux_zstd.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
/*
* Copyright (c) Yann Collet, Facebook, Inc.
* All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion contrib/linux-kernel/mem.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
/*
* Copyright (c) Yann Collet, Facebook, Inc.
* All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion contrib/linux-kernel/zstd_compress_module.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
/*
* Copyright (c) Facebook, Inc.
* All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion contrib/linux-kernel/zstd_decompress_module.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
/*
* Copyright (c) Facebook, Inc.
* All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion contrib/linux-kernel/zstd_deps.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
/*
* Copyright (c) Facebook, Inc.
* All rights reserved.
Expand Down

0 comments on commit b25d574

Please sign in to comment.