aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-11-06 19:29:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-07 01:10:53 +0100
commit0b7311300b01d9975e9996327ee469e4f66fb2ec (patch)
tree69c7696ae97c3478df893c55458759a8dc0032ba /target/linux/oxnas
parent2f04012b20515eec74563de74d0528e603aa6f89 (diff)
downloadupstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.gz
upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.bz2
upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.zip
kernel: bump 5.4 to 5.4.158
Removed upstreamed: generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch
index 8c83d55b6c..bc46f308d3 100644
--- a/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch
+++ b/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch
@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1827,6 +1827,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1828,6 +1828,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.