Merge tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2020 20:12:26 +0000 (13:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2020 20:12:26 +0000 (13:12 -0700)
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

1  2 
Documentation/devicetree/bindings/.gitignore
arch/arm/crypto/.gitignore
arch/arm64/crypto/.gitignore
tools/bpf/bpftool/.gitignore
tools/testing/selftests/.gitignore
tools/testing/selftests/bpf/.gitignore
tools/testing/selftests/kvm/.gitignore
tools/testing/selftests/net/.gitignore
tools/testing/selftests/net/mptcp/.gitignore
tools/testing/selftests/vm/.gitignore

index 57afa1533a5ff262ea08f604b35310bce8120d34,66878559822bb60492e898fe0f4c321df29df798..5c6d8ea1a09c4bd884de14c4523f9d2889acb4c9
@@@ -1,2 -1,3 +1,3 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  *.example.dts
 -processed-schema.yaml
 +processed-schema*.yaml
Simple merge
index e403b1343328d86902984d3914baf4cbcf0b1d90,a11a86217ffb5a78f93c15f1a342923c3acb317a..fcf2d731e6c1dfdff8896662ba4d34c70291eee3
@@@ -1,3 -1,3 +1,4 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  sha256-core.S
  sha512-core.S
 +poly1305-core.S
index 8d6e8901ed2be26cbe9b7361ec939fb4fa6b1521,5c232659a98b9f4a2f1d61db624fb6fef11bfe5d..26cde83e1ca351ce2b4f51d3a0823da53e011119
@@@ -1,5 -1,5 +1,6 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  *.d
 +/_bpftool
  /bpftool
  bpftool*.8
  bpf-helpers.*
Simple merge
index 16877c3daabfc180fe3b711668617f93cd487abb,2f85dc944fbdf655173f7294c5bc349d7397b9e4..a9b2b48947ffc6ff1fbf25b37ad5113b1840d0aa
@@@ -1,6 -1,6 +1,7 @@@
 -/s390x/sync_regs_test
+ # SPDX-License-Identifier: GPL-2.0-only
  /s390x/memop
 +/s390x/resets
 +/s390x/sync_regs_test
  /x86_64/cr4_cpuid_sync_test
  /x86_64/evmcs_test
  /x86_64/hyperv_cpuid
index ea13b255a99d010246c717e3f508877e15a0b332,beea6541fb217127fc336fc0b34f7bedd26ffada..260336d5f0b13f037bd981961abbcfafc16bb3aa
@@@ -1,3 -1,3 +1,4 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  mptcp_connect
 +pm_nl_ctl
  *.pcap
Simple merge