Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-10-17 12:06:00 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-10-17 12:06:00 +0200
commit2faff3d2be7eccc5db9d3b640e611bdd3561be10 (patch)
treeb309dd84facc6676dd7697adeec194e6b9b34108
parent2eabed90fad43dc6ce0dbb522e2ee15709b9a415 (diff)
Automatically updated to 5.4-rc3-next-20191017linux-next
-rw-r--r--config/arm64/vanilla4
-rw-r--r--config/armv7hl/vanilla1
-rw-r--r--config/ppc64/vanilla1
-rw-r--r--config/ppc64le/vanilla1
-rw-r--r--config/x86_64/vanilla1
-rw-r--r--rpm/config.sh2
6 files changed, 4 insertions, 6 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 983d114cca..367f64c384 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -1908,7 +1908,6 @@ CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
CONFIG_BT_MTKSDIO=m
CONFIG_BT_MTKUART=m
CONFIG_BT_QCOMSMD=m
@@ -3931,6 +3930,7 @@ CONFIG_KEYBOARD_MCS=m
CONFIG_KEYBOARD_MPR121=m
CONFIG_KEYBOARD_SNVS_PWRKEY=m
CONFIG_KEYBOARD_IMX=m
+CONFIG_KEYBOARD_IMX_SC_KEY=m
CONFIG_KEYBOARD_NEWTON=m
CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_OPENCORES=m
@@ -8767,6 +8767,8 @@ CONFIG_SOUNDWIRE=y
#
# SoundWire Devices
#
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
#
# SOC (System On Chip) specific Drivers
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 0625e8eb6a..ea2a6d59a3 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -2008,7 +2008,6 @@ CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
CONFIG_BT_MTKSDIO=m
CONFIG_BT_MTKUART=m
CONFIG_BT_HCIRSI=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index b4d9954f9c..9f16474987 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1627,7 +1627,6 @@ CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
CONFIG_BT_MTKUART=m
CONFIG_BT_HCIRSI=m
# end of Bluetooth device drivers
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 47783acad4..6248cbfce4 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1567,7 +1567,6 @@ CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
CONFIG_BT_MTKUART=m
CONFIG_BT_HCIRSI=m
# end of Bluetooth device drivers
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index ce15353793..de187f32c3 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1904,7 +1904,6 @@ CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
CONFIG_BT_MTKSDIO=m
CONFIG_BT_MTKUART=m
CONFIG_BT_HCIRSI=m
diff --git a/rpm/config.sh b/rpm/config.sh
index 86269f0eb6..6a7cebc01f 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.4-rc3-next-20191016
+SRCVERSION=5.4-rc3-next-20191017
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all