aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath25
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-12-31 19:25:45 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-01-01 17:07:28 +0100
commit9b1b89229f0efef43a738f91875e0fd9fcc42277 (patch)
tree14d5481d6daa9852dd36554e26e10517651c141f /target/linux/ath25
parentc22b689cf89f5a17ed6e35c1fb92c19b4a7126ae (diff)
downloadupstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.tar.gz
upstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.tar.bz2
upstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.zip
kernel: bump 5.4 to 5.4.86
Removed upstreamed patches: pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch Manually merged: pending-5.4/611-netfilter_match_bypass_default_table.patch layerscape/302-dts-0112-arm64-dts-fsl-ls1028a-prepare-dts-for-overlay.patch Build-tested: ipq806x/R7800, bcm27xx/bcm2711, ath79/{generic,tiny}, ipq40xx, octeon, ramips/mt7621, realtek, x86/64 Run-tested: ipq806x/R7800, realtek Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Tested-by: John Audia <graysky@archlinux.us> Tested-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/ath25')
-rw-r--r--target/linux/ath25/patches-5.4/130-watchdog.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ath25/patches-5.4/130-watchdog.patch b/target/linux/ath25/patches-5.4/130-watchdog.patch
index 8a5bd83418..b0bdd88bd1 100644
--- a/target/linux/ath25/patches-5.4/130-watchdog.patch
+++ b/target/linux/ath25/patches-5.4/130-watchdog.patch
@@ -212,7 +212,7 @@
+MODULE_ALIAS("platform:" DRIVER_NAME);
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -1830,6 +1830,13 @@ config PIC32_DMT
+@@ -1832,6 +1832,13 @@ config PIC32_DMT
To compile this driver as a loadable module, choose M here.
The module will be called pic32-dmt.