diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-07-01 14:31:42 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-07-01 14:31:42 +0200 |
commit | 0344144e771c71b764966551283814de3653ce6a (patch) | |
tree | 09913ef1fe7b83726e4eea5968c4af9d41dcdcc8 /target/linux/ramips | |
parent | 2034387af45f11c933e36ebdde4ca198c45068f9 (diff) | |
download | upstream-0344144e771c71b764966551283814de3653ce6a.tar.gz upstream-0344144e771c71b764966551283814de3653ce6a.tar.bz2 upstream-0344144e771c71b764966551283814de3653ce6a.zip |
kernel: bump 5.10 to 5.10.185
Removed because upstreamed:
uml/patches-5.10/001-um-Fix-build-w-o-CONFIG_PM_SLEEP.patch
All other patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r-- | target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch | 4 | ||||
-rw-r--r-- | target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch b/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch index a5df046ba7..2ea727b707 100644 --- a/target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch +++ b/target/linux/ramips/patches-5.10/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 -@@ -542,8 +542,28 @@ static int __init bootcmdline_scan_chose +@@ -543,8 +543,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; /* -@@ -557,6 +577,14 @@ static void __init bootcmdline_init(void +@@ -558,6 +578,14 @@ static void __init bootcmdline_init(void } /* diff --git a/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch b/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch index 59d4b3ce56..85f3a3067f 100644 --- a/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch +++ b/target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c -@@ -694,8 +694,6 @@ static void __init arch_mem_init(char ** +@@ -695,8 +695,6 @@ static void __init arch_mem_init(char ** if (crashk_res.start != crashk_res.end) memblock_reserve(crashk_res.start, resource_size(&crashk_res)); #endif @@ -19,7 +19,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* * In order to reduce the possibility of kernel panic when failed to * get IO TLB memory under CONFIG_SWIOTLB, it is better to allocate -@@ -815,6 +813,7 @@ void __init setup_arch(char **cmdline_p) +@@ -816,6 +814,7 @@ void __init setup_arch(char **cmdline_p) cpu_cache_init(); paging_init(); |