summaryrefslogtreecommitdiff
path: root/net/bpfilter
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-04-03 13:12:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-03 13:12:26 -0700
commitff2ae607c6f329d11a3b0528801ea7474be8c3e9 (patch)
tree670e6536e92033a828e827c3a067b26d81fb452d /net/bpfilter
parent6cd3d4019ba3f45aa1a87e4e914e81d367b59937 (diff)
parent71db3aa2816da62a2d150ad9fa81168537db4037 (diff)
downloadlwn-ff2ae607c6f329d11a3b0528801ea7474be8c3e9.tar.gz
lwn-ff2ae607c6f329d11a3b0528801ea7474be8c3e9.zip
Merge tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull SPDX updates from Greg KH: "Here are three SPDX patches for 5.7-rc1. One fixes up the SPDX tag for a single driver, while the other two go through the tree and add SPDX tags for all of the .gitignore files as needed. Nothing too complex, but you will get a merge conflict with your current tree, that should be trivial to handle (one file modified by two things, one file deleted.) All three of these have been in linux-next for a while, with no reported issues other than the merge conflict" * tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: ASoC: MT6660: make spdxcheck.py happy .gitignore: add SPDX License Identifier .gitignore: remove too obvious comments
Diffstat (limited to 'net/bpfilter')
-rw-r--r--net/bpfilter/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bpfilter/.gitignore b/net/bpfilter/.gitignore
index e97084e3eea2..f34e85ee8204 100644
--- a/net/bpfilter/.gitignore
+++ b/net/bpfilter/.gitignore
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
bpfilter_umh