diff options
author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-05-28 17:21:51 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-05-28 17:21:51 +0200 |
commit | 1e0566fd4a81bac04aed6af818e6938e6c71d389 (patch) | |
tree | 38df614f2951905d48f744c1a9393afd3b34ce4e /drivers/uwb | |
parent | media: venus: firmware: fix leaked of_node references (diff) | |
parent | Linux 5.2-rc2 (diff) | |
download | linux-1e0566fd4a81bac04aed6af818e6938e6c71d389.tar.xz linux-1e0566fd4a81bac04aed6af818e6938e6c71d389.zip |
Merge tag 'v5.2-rc2' into patchwork
Merge back from upstream into media tree, as there are some
patches merged upstream that has pontential of causing
conflicts (one actually rised a conflict already).
Linux 5.2-rc2
* tag 'v5.2-rc2': (377 commits)
Linux 5.2-rc2
random: fix soft lockup when trying to read from an uninitialized blocking pool
tracing: Silence GCC 9 array bounds warning
ext4: fix dcache lookup of !casefolded directories
locking/lock_events: Use this_cpu_add() when necessary
KVM: x86: fix return value for reserved EFER
tools/kvm_stat: fix fields filter for child events
KVM: selftests: Wrap vcpu_nested_state_get/set functions with x86 guard
kvm: selftests: aarch64: compile with warnings on
kvm: selftests: aarch64: fix default vm mode
kvm: selftests: aarch64: dirty_log_test: fix unaligned memslot size
KVM: s390: fix memory slot handling for KVM_SET_USER_MEMORY_REGION
KVM: x86/pmu: do not mask the value that is written to fixed PMUs
KVM: x86/pmu: mask the result of rdpmc according to the width of the counters
x86/kvm/pmu: Set AMD's virt PMU version to 1
KVM: x86: do not spam dmesg with VMCS/VMCB dumps
kvm: Check irqchip mode before assign irqfd
kvm: svm/avic: fix off-by-one in checking host APIC ID
KVM: selftests: do not blindly clobber registers in guest asm
KVM: selftests: Remove duplicated TEST_ASSERT in hyperv_cpuid.c
...
Diffstat (limited to 'drivers/uwb')
-rw-r--r-- | drivers/uwb/Kconfig | 1 | ||||
-rw-r--r-- | drivers/uwb/i1480/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig index afac2588dab4..259e053e1e09 100644 --- a/drivers/uwb/Kconfig +++ b/drivers/uwb/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # UWB device configuration # diff --git a/drivers/uwb/i1480/Makefile b/drivers/uwb/i1480/Makefile index d69da1684cfb..d26fb9b845ae 100644 --- a/drivers/uwb/i1480/Makefile +++ b/drivers/uwb/i1480/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_UWB_I1480U) += dfu/ i1480-est.o |