diff options
author | John Audia <therealgraysky@proton.me> | 2023-06-21 12:17:06 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-25 16:05:18 +0200 |
commit | 51c397c33fc47202d50ca90c779f1c3239ebbc3f (patch) | |
tree | 14799ee783a84cbbe23a67b572771c503b319e49 /target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch | |
parent | b1b829ad6a71f32c0f8a669db53264cf5b1f259b (diff) | |
download | upstream-51c397c33fc47202d50ca90c779f1c3239ebbc3f.tar.gz upstream-51c397c33fc47202d50ca90c779f1c3239ebbc3f.tar.bz2 upstream-51c397c33fc47202d50ca90c779f1c3239ebbc3f.zip |
kernel: bump 5.15 to 5.15.118
All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 1f5fce27c195373fedcf233a48470de97752058f)
Diffstat (limited to 'target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch')
-rw-r--r-- | target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch b/target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch index 07635a9d86..ef45aac61b 100644 --- a/target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch +++ b/target/linux/ramips/patches-5.15/314-MIPS-add-bootargs-override-property.patch @@ -17,7 +17,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c -@@ -544,8 +544,28 @@ static int __init bootcmdline_scan_chose +@@ -545,8 +545,28 @@ static int __init bootcmdline_scan_chose #endif /* CONFIG_OF_EARLY_FLATTREE */ @@ -46,7 +46,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> bool dt_bootargs = false; /* -@@ -559,6 +579,14 @@ static void __init bootcmdline_init(void +@@ -560,6 +580,14 @@ static void __init bootcmdline_init(void } /* |