From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2020 20:12:26 +0000 (-0700)
Subject: Merge tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ff2ae607c6f329d11a3b0528801ea7474be8c3e9;p=linux.git

Merge tag 'spdx-5.7-rc1' of git://git./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
---

ff2ae607c6f329d11a3b0528801ea7474be8c3e9
diff --cc Documentation/devicetree/bindings/.gitignore
index 57afa1533a5ff,66878559822bb..5c6d8ea1a09c4
--- a/Documentation/devicetree/bindings/.gitignore
+++ b/Documentation/devicetree/bindings/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  *.example.dts
 -processed-schema.yaml
 +processed-schema*.yaml
diff --cc arch/arm64/crypto/.gitignore
index e403b1343328d,a11a86217ffb5..fcf2d731e6c1d
--- a/arch/arm64/crypto/.gitignore
+++ b/arch/arm64/crypto/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  sha256-core.S
  sha512-core.S
 +poly1305-core.S
diff --cc tools/bpf/bpftool/.gitignore
index 8d6e8901ed2be,5c232659a98b9..26cde83e1ca35
--- a/tools/bpf/bpftool/.gitignore
+++ b/tools/bpf/bpftool/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  *.d
 +/_bpftool
  /bpftool
  bpftool*.8
  bpf-helpers.*
diff --cc tools/testing/selftests/kvm/.gitignore
index 16877c3daabfc,2f85dc944fbdf..a9b2b48947ffc
--- a/tools/testing/selftests/kvm/.gitignore
+++ b/tools/testing/selftests/kvm/.gitignore
@@@ -1,6 -1,6 +1,7 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
 -/s390x/sync_regs_test
  /s390x/memop
 +/s390x/resets
 +/s390x/sync_regs_test
  /x86_64/cr4_cpuid_sync_test
  /x86_64/evmcs_test
  /x86_64/hyperv_cpuid
diff --cc tools/testing/selftests/net/mptcp/.gitignore
index ea13b255a99d0,beea6541fb217..260336d5f0b13
--- a/tools/testing/selftests/net/mptcp/.gitignore
+++ b/tools/testing/selftests/net/mptcp/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  mptcp_connect
 +pm_nl_ctl
  *.pcap