Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-21 12:03:01 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-21 12:03:01 +0200
commitdec37e3533998f7b8dd705ee807c9eb71724ac1e (patch)
tree90bc3cef77b540c9c3d9cccf080cab3a35e55772
parentc0e0d0be865b4efb079251cfd5a21a18ea581a97 (diff)
Automatically updated to 5.2-13348-gf1a3b43cc1f5vanilla
-rw-r--r--config/arm64/vanilla2
-rw-r--r--config/armv7hl/vanilla2
-rw-r--r--config/i386/vanilla3
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla4
-rw-r--r--rpm/config.sh2
7 files changed, 10 insertions, 7 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index ef3499d926..7bb4561941 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -85,7 +85,7 @@ CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_LL is not set
#
# CPU/Task time and stats accounting
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 78f0ff7384..4dfc5fccd4 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -91,7 +91,7 @@ CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_LL is not set
#
# CPU/Task time and stats accounting
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 1852fec2bb..9edf7d4c7b 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -97,7 +97,7 @@ CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_LL is not set
#
# CPU/Task time and stats accounting
@@ -3794,6 +3794,7 @@ CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_ADC is not set
CONFIG_KEYBOARD_ADP5588=m
CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_QT1050=m
CONFIG_KEYBOARD_QT1070=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index e30d47b872..e9f20e27e1 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -82,7 +82,7 @@ CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_LL is not set
#
# CPU/Task time and stats accounting
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index cb771aee30..8adcf08051 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -81,7 +81,7 @@ CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_LL is not set
#
# CPU/Task time and stats accounting
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 74d0996cb0..790199d4db 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -98,7 +98,7 @@ CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_LL is not set
#
# CPU/Task time and stats accounting
@@ -3775,6 +3775,7 @@ CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_ADC is not set
CONFIG_KEYBOARD_ADP5588=m
CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_QT1050=m
CONFIG_KEYBOARD_QT1070=m
@@ -9293,6 +9294,7 @@ CONFIG_HAS_DMA=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
CONFIG_DMA_VIRT_OPS=y
CONFIG_SWIOTLB=y
# CONFIG_DMA_API_DEBUG is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index aadc37114f..1da5a2969f 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.2-13156-gabdfd52a295f
+SRCVERSION=5.2-13348-gf1a3b43cc1f5
# 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