aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-08-25 10:52:50 -0400
committerPetr Štetiar <ynezz@true.cz>2022-08-25 20:23:59 +0200
commitfc89ec06928469021010c2f5776450f739af07a5 (patch)
tree0add09a03dd518a74cb627edbeb30bd7a5aa8f98 /target/linux/octeon
parent34ddd2e545f068e4684ecce98c1da3a6c7c9b04a (diff)
downloadupstream-fc89ec06928469021010c2f5776450f739af07a5.tar.gz
upstream-fc89ec06928469021010c2f5776450f739af07a5.tar.bz2
upstream-fc89ec06928469021010c2f5776450f739af07a5.zip
kernel: bump 5.10 to 5.10.138
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/octeon')
-rw-r--r--target/linux/octeon/patches-5.10/130-itus_shield_support.patch2
-rw-r--r--target/linux/octeon/patches-5.10/150-ubnt_usg_support.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/octeon/patches-5.10/130-itus_shield_support.patch b/target/linux/octeon/patches-5.10/130-itus_shield_support.patch
index 15f514209d..a041331c20 100644
--- a/target/linux/octeon/patches-5.10/130-itus_shield_support.patch
+++ b/target/linux/octeon/patches-5.10/130-itus_shield_support.patch
@@ -20,7 +20,7 @@
}
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
-@@ -773,7 +773,7 @@ int __init octeon_prune_device_tree(void
+@@ -774,7 +774,7 @@ int __init octeon_prune_device_tree(void
if (fdt_check_header(initial_boot_params))
panic("Corrupt Device Tree.");
diff --git a/target/linux/octeon/patches-5.10/150-ubnt_usg_support.patch b/target/linux/octeon/patches-5.10/150-ubnt_usg_support.patch
index 721f657978..88aa1c406f 100644
--- a/target/linux/octeon/patches-5.10/150-ubnt_usg_support.patch
+++ b/target/linux/octeon/patches-5.10/150-ubnt_usg_support.patch
@@ -18,7 +18,7 @@
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
-@@ -634,6 +634,7 @@ static void __init octeon_rx_tx_delay(in
+@@ -635,6 +635,7 @@ static void __init octeon_rx_tx_delay(in
}
break;
case CVMX_BOARD_TYPE_UBNT_E100: