Merge branch 'upstream' for Linux 5.2.4

3 files changed, 15 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0b9427793dc..7be5afaf8cfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jul 31 00:46:14 UTC 2019
+# Wed Jul 31 01:24:29 UTC 2019
 pkgbase = linux-fsync
-	pkgver = 5.2.1.arch1
+	pkgver = 5.2.4.arch1
 	pkgrel = 1
-	url = https://git.archlinux.org/linux.git/log/?h=v5.2.1-arch1
+	url = https://git.archlinux.org/linux.git/log/?h=v5.2.4-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = xmlto
@@ -17,7 +17,7 @@ pkgbase = linux-fsync
 	makedepends = graphviz
 	makedepends = imagemagick
 	options = !strip
-	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.2.1-arch1
+	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.2.4-arch1
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
@@ -25,7 +25,7 @@ pkgbase = linux-fsync
 	source = futex-wait-multiple-5.2.1.patch
 	source = futex-Consolidate-duplicated-timer-setup-code.patch
 	sha256sums = SKIP
-	sha256sums = d49d9d0570785051f6b8b58962a4d792d1d1501ecb0a98dcf616226e6da6bdb5
+	sha256sums = cf73b273e9b05f30aab91c36a7493274cf88c163025ffe0b30c98c24caa10f32
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
diff --git a/PKGBUILD b/PKGBUILD
index ba894fee2d61..1ad27652ce7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 #pkgbase=linux               # Build stock -ARCH kernel
 pkgbase=linux-fsync       # Build kernel with a different name
-_srcver=5.2.1-arch1
+_srcver=5.2.4-arch1
 pkgver=${_srcver//-/.}
 pkgrel=1
 arch=(x86_64)
@@ -31,7 +31,7 @@ validpgpkeys=(
   '8218F88849AAC522E94CF470A5E9288C4FA415FA'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            'd49d9d0570785051f6b8b58962a4d792d1d1501ecb0a98dcf616226e6da6bdb5'
+            'cf73b273e9b05f30aab91c36a7493274cf88c163025ffe0b30c98c24caa10f32'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/config b/config
index 0038c6ae70d3..b196ce7945ba 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.2.1-arch1 Kernel Configuration
+# Linux/x86 5.2.4-arch1 Kernel Configuration
 #
 
 #
@@ -2135,8 +2135,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_USER_HELPER is not set
 # end of Firmware loader
 
 CONFIG_WANT_DEV_COREDUMP=y
@@ -7657,11 +7656,10 @@ CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP8501=m
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
 CONFIG_LEDS_LP8788=m
 CONFIG_LEDS_LP8860=m
 CONFIG_LEDS_CLEVO_MAIL=m
@@ -8353,7 +8351,7 @@ CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_RBTN=m
-CONFIG_DELL_RBU=m
+# CONFIG_DELL_RBU is not set
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_AMILO_RFKILL=m
@@ -9741,10 +9739,7 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
-CONFIG_GCC_PLUGIN_STACKLEAK=y
-CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
-CONFIG_STACKLEAK_METRICS=y
-CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # end of Memory initialization
 # end of Kernel hardening options
 # end of Security options