diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-04-10 12:42:32 +0100 |
|---|---|---|
| committer | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-08-16 22:38:31 +0100 |
| commit | 7d139bd5f37cda7f081174a0e5afc53988a37029 (patch) | |
| tree | 34cd4523787153b2497b978aa68ee67879db3e73 /target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch | |
| parent | fb29b91c5b9baff24bfa5146c2649d8dd5e01af3 (diff) | |
| download | upstream-7d139bd5f37cda7f081174a0e5afc53988a37029.tar.gz upstream-7d139bd5f37cda7f081174a0e5afc53988a37029.tar.bz2 upstream-7d139bd5f37cda7f081174a0e5afc53988a37029.zip | |
mvebu: refresh 5.15 patches
Deleted (upstreamed):
303-linksys_hardcode_nand_ecc_settings.patch [1]
Deleted (not needed):
314-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch [2]
Manually rebased:
700-mvneta-tx-queue-workaround.patch
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4daff3e5b42422cd4af758cc7768223d2b7f6e14
[2] https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=7f73acade0cde61341cb77e0dc74de51ac059d4f
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch')
| -rw-r--r-- | target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch index 36f10fcfb5..071ea6742d 100644 --- a/target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch @@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com> --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1727,6 +1727,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. @@ -176,7 +176,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com> } --- a/init/main.c +++ b/init/main.c -@@ -110,6 +110,10 @@ +@@ -113,6 +113,10 @@ #include <kunit/test.h> @@ -187,7 +187,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com> static int kernel_init(void *); extern void init_IRQ(void); -@@ -904,6 +908,18 @@ asmlinkage __visible void __init __no_sa +@@ -990,6 +994,18 @@ asmlinkage __visible void __init __no_sa page_alloc_init(); pr_notice("Kernel command line: %s\n", saved_command_line); |