kernel: bump 5.10 to 5.10.189
authorHauke Mehrtens <hauke@hauke-m.de>
Fri, 11 Aug 2023 18:13:35 +0000 (18:13 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 11 Aug 2023 21:17:31 +0000 (23:17 +0200)
All patches automatically rebased.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
23 files changed:
include/kernel-5.10
target/linux/ath25/patches-5.10/107-ar5312_gpio.patch
target/linux/ath79/patches-5.10/0032-MIPS-ath79-sanitize-symbols.patch
target/linux/bcm63xx/patches-5.10/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
target/linux/bmips/patches-5.10/001-v5.11-mips-bmips-select-ARCH_HAS_RESET_CONTROLLER.patch
target/linux/bmips/patches-5.10/202-mips-bmips-disable-ARCH_HAS_SYNC_DMA_FOR_CPU_ALL.patch
target/linux/bmips/patches-5.10/600-mips-bmips-add-pci-support.patch
target/linux/generic/backport-5.10/050-v5.16-05-mips-bpf-Enable-eBPF-JITs.patch
target/linux/generic/backport-5.10/103-v5.13-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch
target/linux/generic/hack-5.10/220-arm-gc_sections.patch
target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch
target/linux/generic/pending-5.10/300-mips_expose_boot_raw.patch
target/linux/generic/pending-5.10/920-mangle_bootargs.patch
target/linux/ipq806x/patches-5.10/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
target/linux/ipq806x/patches-5.10/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch
target/linux/lantiq/patches-5.10/0152-lantiq-VPE.patch
target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch
target/linux/ramips/patches-5.10/314-MIPS-add-bootargs-override-property.patch
target/linux/ramips/patches-5.10/315-owrt-hack-fix-mt7688-cache-issue.patch
target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch
target/linux/x86/config-5.10

index 9265cbdb219cbe5734bda84ebc191832605677cd..c265f2d3d87e7b12253296740d31dae6e18307c1 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .188
-LINUX_KERNEL_HASH-5.10.188 = c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112
+LINUX_VERSION-5.10 = .189
+LINUX_KERNEL_HASH-5.10.189 = 4c03516ae1d417571faaef175932d0892710bcbe0173e40550014d043d9098c9
index a1efdbeeae1403efb23adf49f63f6ad31061d958..d04304a53fefe234384f72ef985b06cfc5b077ee 100644 (file)
 +subsys_initcall(ar5312_gpio_init);
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -219,6 +219,7 @@ config ATH25
+@@ -220,6 +220,7 @@ config ATH25
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
index 40cd1689a04b1d951592b98c97f3bd0daa47dd39..7509df82f3ac32327dbae4d5f7ed9067abea5c4c 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -245,6 +245,8 @@ config ATH79
+@@ -246,6 +246,8 @@ config ATH79
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_MIPS16
        select SYS_SUPPORTS_ZBOOT_UART_PROM
index b70f28e5a6754412689cb3f9bbedf12a5deb049b..be499f953947982d8f5d937ab6d1bdb96add1a84 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -319,6 +319,9 @@ config BCM63XX
+@@ -320,6 +320,9 @@ config BCM63XX
        select SYNC_R4K
        select DMA_NONCOHERENT
        select IRQ_MIPS_CPU
index 43ba9ab5b22f0617047c662bed2afa23fc65d2cd..69d1b96ad581ce9d174c238f66a9f739b06811d9 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -252,6 +252,7 @@ config ATH79
+@@ -253,6 +253,7 @@ config ATH79
  
  config BMIPS_GENERIC
        bool "Broadcom Generic BMIPS kernel"
index ba7cf5c6c45c258a6ef00d3e2a51fb76e24bfb90..9d1fc01a1bee75ba6b03c3541261fc29244ea7f8 100644 (file)
@@ -52,7 +52,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -253,7 +253,6 @@ config ATH79
+@@ -254,7 +254,6 @@ config ATH79
  config BMIPS_GENERIC
        bool "Broadcom Generic BMIPS kernel"
        select ARCH_HAS_RESET_CONTROLLER
index f74a14f25688be30d930aa4fd31fb107a94724c2..6469956063035ed4a70bdd75737f0f1d3337ddbc 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -265,6 +265,7 @@ config BMIPS_GENERIC
+@@ -266,6 +266,7 @@ config BMIPS_GENERIC
        select BCM7038_L1_IRQ
        select BCM7120_L2_IRQ
        select BRCMSTB_L2_IRQ
index 10685c5f3c21348a56db9695f012e830e77fe248..9173ce04778ee137290bc656eb05b3178f8a5b74 100644 (file)
@@ -24,7 +24,7 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
  L:    bpf@vger.kernel.org
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -49,7 +49,6 @@ config MIPS
+@@ -50,7 +50,6 @@ config MIPS
        select HAVE_ARCH_TRACEHOOK
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
        select HAVE_ASM_MODVERSIONS
@@ -32,7 +32,7 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
        select HAVE_CONTEXT_TRACKING
        select HAVE_TIF_NOHZ
        select HAVE_C_RECORDMCOUNT
-@@ -57,7 +56,10 @@ config MIPS
+@@ -58,7 +57,10 @@ config MIPS
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
index fafe530ac58343d409edf15b13f1c77f7984fa32..e451a49ac2dc1e61fac7d8520f2dda242e9abc71 100644 (file)
@@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2088,7 +2088,7 @@ config CPU_MIPS32
+@@ -2089,7 +2089,7 @@ config CPU_MIPS32
  config CPU_MIPS64
        bool
        default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
index 5b36c5ebaecd7deed6bdc66278f86a1a466bfb1a..a3214f11e551b548cc8d09df08ebe7542f91c295 100644 (file)
@@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 ---
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -114,6 +114,7 @@ config ARM
+@@ -115,6 +115,7 @@ config ARM
        select HAVE_UID16
        select HAVE_VIRT_CPU_ACCOUNTING_GEN
        select IRQ_FORCED_THREADING
index 4edf527246b8910086b64e8a6c56acd948bd2af9..ea72094cee02aa3a216ad20965f36b1b0ae0edd8 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1170,6 +1170,10 @@ config MIPS_MSC
+@@ -1171,6 +1171,10 @@ config MIPS_MSC
  config SYNC_R4K
        bool
  
index 706c5dee224d56d2c14a2a7f0ba46543adeb3f1d..ee3fc5e108c70849ecf8332d59d167273b8323e4 100644 (file)
@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1085,9 +1085,6 @@ config FW_ARC
+@@ -1086,9 +1086,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
  config CEVT_BCM1480
        bool
  
-@@ -3182,6 +3179,18 @@ choice
+@@ -3183,6 +3180,18 @@ choice
                bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice
  
index 390152078f5b81102d847c76704c3f076f54f7a4..72a5ca4d2fce53df791c37b1713ecd4f45fbb9e9 100644 (file)
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
        help
 --- a/init/main.c
 +++ b/init/main.c
-@@ -608,6 +608,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -606,6 +606,29 @@ static inline void setup_nr_cpu_ids(void
  static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  #endif
  
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -869,6 +892,7 @@ asmlinkage __visible void __init __no_sa
+@@ -866,6 +889,7 @@ asmlinkage __visible void __init __no_sa
        pr_notice("%s", linux_banner);
        early_security_init();
        setup_arch(&command_line);
index b73218e71bb0e2136ab8ec6eac69cbd6a5c320f9..5065c12d8d663a5637a26e6c712cf1808ba70340 100644 (file)
@@ -33,7 +33,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -322,7 +322,7 @@ config ARCH_MULTIPLATFORM
+@@ -323,7 +323,7 @@ config ARCH_MULTIPLATFORM
        select ARCH_SELECT_MEMORY_MODEL
        select ARM_HAS_SG_CHAIN
        select ARM_PATCH_PHYS_VIRT
index e9f2d059371c29bd601f83ce94a1e3c57904f156..5bfc3eddefe5c21a9fe609968a0472713de51e23 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1778,6 +1778,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.
  
@@ -178,7 +178,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  }
 --- a/init/main.c
 +++ b/init/main.c
-@@ -110,6 +110,10 @@
+@@ -108,6 +108,10 @@
  
  #include <kunit/test.h>
  
@@ -189,7 +189,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  static int kernel_init(void *);
  
  extern void init_IRQ(void);
-@@ -906,6 +910,18 @@ asmlinkage __visible void __init __no_sa
+@@ -903,6 +907,18 @@ asmlinkage __visible void __init __no_sa
        pr_notice("Kernel command line: %s\n", saved_command_line);
        /* parameters may set static keys */
        jump_label_init();
index ddc3b7cb5279b1ec65d0585f12cd6730dd9a8b42..09793b561be1c3120df5ac3b6033976d3b67f6fd 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1790,6 +1790,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+@@ -1791,6 +1791,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
  
  endchoice
  
index 5431ebcc2a3b1bcd42e21a73930182dc28a259d0..0da36083a9c98f31de10a647d6d0e8f8d3e5d1d5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2438,6 +2438,12 @@ config MIPS_VPE_LOADER
+@@ -2439,6 +2439,12 @@ config MIPS_VPE_LOADER
          Includes a loader for loading an elf relocatable object
          onto another VPE and running it.
  
index 04c80113c1523429511c415c9bf61a2efd02f069..c220e906cfa85ac044c9822dc59c427d0fc683d4 100644 (file)
@@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1778,6 +1778,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 @@
+@@ -108,6 +108,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
+@@ -901,6 +905,18 @@ asmlinkage __visible void __init __no_sa
        page_alloc_init();
  
        pr_notice("Kernel command line: %s\n", saved_command_line);
index 8f56bdbf9c291ce5fcbd8e696f11b7bc0572b145..de2868ce979d6c235b3c8a2f36d4cd806520cba2 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1778,6 +1778,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.
  
@@ -157,7 +157,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  }
 --- a/init/main.c
 +++ b/init/main.c
-@@ -110,6 +110,10 @@
+@@ -108,6 +108,10 @@
  
  #include <kunit/test.h>
  
@@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  static int kernel_init(void *);
  
  extern void init_IRQ(void);
-@@ -904,6 +908,18 @@ asmlinkage __visible void __init __no_sa
+@@ -901,6 +905,18 @@ asmlinkage __visible void __init __no_sa
        page_alloc_init();
  
        pr_notice("Kernel command line: %s\n", saved_command_line);
index 2ea727b7078d3e620db512de582f7d41f3fe973f..ef45aac61bda92c85dde432eaf2d91137ec5b656 100644 (file)
@@ -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
-@@ -543,8 +543,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;
  
        /*
-@@ -558,6 +578,14 @@ static void __init bootcmdline_init(void
+@@ -560,6 +580,14 @@ static void __init bootcmdline_init(void
        }
  
        /*
index 85f3a3067fac5e83cb1e532f9f2b2f7ff6c60df3..0476847c3ba48dde3352fa0194bb1aecd1b8cc05 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c
-@@ -695,8 +695,6 @@ static void __init arch_mem_init(char **
+@@ -697,8 +697,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
-@@ -816,6 +814,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -818,6 +816,7 @@ void __init setup_arch(char **cmdline_p)
  
        cpu_cache_init();
        paging_init();
index 373bcff421dc7657c7593b6f8651fa7511b257b2..b05363222bf773a093b558cce435b1561d621422 100644 (file)
@@ -10,7 +10,7 @@
  platform-$(CONFIG_SGI_IP28)           += sgi-ip22/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1037,8 +1037,58 @@ config NLM_XLP_BOARD
+@@ -1038,8 +1038,58 @@ config NLM_XLP_BOARD
          This board is based on Netlogic XLP Processor.
          Say Y here if you have a XLP based board.
  
@@ -69,7 +69,7 @@
  source "arch/mips/alchemy/Kconfig"
  source "arch/mips/ath25/Kconfig"
  source "arch/mips/ath79/Kconfig"
-@@ -1097,6 +1147,9 @@ config CEVT_GT641XX
+@@ -1098,6 +1148,9 @@ config CEVT_GT641XX
  config CEVT_R4K
        bool
  
index 6868dec18a76af50993e5699d40278e8a127aa24..b75e2859eb598a99504fa0275577dd737951e982 100644 (file)
@@ -57,6 +57,7 @@ CONFIG_CPU_IBRS_ENTRY=y
 # CONFIG_SLS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_SRSO=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y
@@ -115,6 +116,7 @@ CONFIG_FUSION=y
 CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SPI=y
 CONFIG_FW_LOADER_PAGED_BUF=y
+# CONFIG_GDS_FORCE_MITIGATION is not set
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y