aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-07-07 15:36:06 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-17 13:23:10 +0200
commit9a0de5e1a1e58b331050f21ef59f9d1cd105aeda (patch)
treeee0fdb740956b648f3b38362823cdcc7a038df20
parentb607b06b91ed598d07f549874aa1f4f9a6240242 (diff)
downloadupstream-9a0de5e1a1e58b331050f21ef59f9d1cd105aeda.tar.gz
upstream-9a0de5e1a1e58b331050f21ef59f9d1cd105aeda.tar.bz2
upstream-9a0de5e1a1e58b331050f21ef59f9d1cd105aeda.zip
kernel: bump 5.10 to 5.10.48
No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index bf35f2a182..44f258965f 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif
LINUX_VERSION-5.4 = .132
-LINUX_VERSION-5.10 = .47
+LINUX_VERSION-5.10 = .48
LINUX_KERNEL_HASH-5.4.132 = 8466adbfb3579e751ede683496df7bb20f258b5f882250f3dd82be63736d00ef
-LINUX_KERNEL_HASH-5.10.47 = 30b52a2fe6d1e0c1e1dc651d5df9a37eb54b35ea1f7f51b9f23d8903c29ae1c5
+LINUX_KERNEL_HASH-5.10.48 = dbd1193480e1b85928d8dcdd7507365381aafe09810ce3d28677d6f4e722c25e
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch
index 25ea1abe56..01d623ab87 100644
--- a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch
+++ b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch
@@ -27,7 +27,7 @@
obj-$(CONFIG_MFD_INTEL_M10_BMC) += intel-m10-bmc.o
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -1518,6 +1518,12 @@ config GPIO_SODAVILLE
+@@ -1520,6 +1520,12 @@ config GPIO_SODAVILLE
help
Say Y here to support Intel Sodaville GPIO.