From: John Audia <graysky@archlinux.us>
Date: Thu, 8 Jul 2021 12:33:56 +0000 (-0400)
Subject: kernel: bump 5.4 to 5.4.130
X-Git-Tag: v22.03.0-rc1~2170
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=968aa64e61b268e05a4a63dcec99f2a659597415;p=openwrt%2Fstaging%2Fhauke.git

kernel: bump 5.4 to 5.4.130

All patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
---

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index b0611454b1..e9a1046a55 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .129
+LINUX_VERSION-5.4 = .130
 LINUX_VERSION-5.10 = .46
 
-LINUX_KERNEL_HASH-5.4.129 = 4426462413d174909a1d9938ce420b8b3cb219140d164270ccabd282fa2346df
+LINUX_KERNEL_HASH-5.4.130 = 662a71fbab4fe671b987262e3c549754c269a8f8cc67cd5f770534079ef19c7b
 LINUX_KERNEL_HASH-5.10.46 = 569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
diff --git a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch
index 5540b8ae3a..60f8bdff79 100644
--- a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch
+++ b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch
@@ -23,7 +23,7 @@
 +obj-$(CONFIG_MFD_RB4XX_CPLD)	+= rb4xx-cpld.o
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1406,6 +1406,12 @@ config GPIO_SODAVILLE
+@@ -1408,6 +1408,12 @@ config GPIO_SODAVILLE
  	help
  	  Say Y here to support Intel Sodaville GPIO.