Переглянути джерело

kernel: bump 6.1 to 6.1.44

Changelog: https://lore.kernel.org/stable/2023080822-repost-unfiled-2f01@gregkh/

All patches automatically rebased.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: x86/64/AMD Cezanne, filogic/xiaomi_redmi-router-ax6000-ubootmod

Signed-off-by: John Audia <[email protected]>
John Audia 2 роки тому
батько
коміт
1e0ee72b72

+ 2 - 2
include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .43
-LINUX_KERNEL_HASH-6.1.43 = 245248470a62d4e94b46f753afc01e19e45b9e6f3a0fa06e7f5da21fe845a808
+LINUX_VERSION-6.1 = .44
+LINUX_KERNEL_HASH-6.1.44 = 2e51d41fe11d082ae167cee05772bb07ca7f19448d2b46772d8ca2db7673a1a5

+ 1 - 1
target/linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch

@@ -13,7 +13,7 @@ Signed-off-by: Mathew McBride <[email protected]>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -123,7 +123,6 @@ config ARM
+@@ -124,7 +124,6 @@ config ARM
  	select HAVE_VIRT_CPU_ACCOUNTING_GEN
  	select IRQ_FORCED_THREADING
  	select LOCK_MM_AND_FIND_VMA

+ 2 - 2
target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch

@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -274,19 +274,13 @@ config BMIPS_GENERIC
+@@ -275,19 +275,13 @@ config BMIPS_GENERIC
  	select SYNC_R4K
  	select COMMON_CLK
  	select BCM6345_L1_IRQ
@@ -33,7 +33,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  	select SWAP_IO_SPACE
  	select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
  	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
-@@ -296,6 +290,7 @@ config BMIPS_GENERIC
+@@ -297,6 +291,7 @@ config BMIPS_GENERIC
  	select HAVE_PCI
  	select PCI_DRIVERS_GENERIC
  	select FW_CFE

+ 1 - 1
target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch

@@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -288,7 +288,6 @@ config BMIPS_GENERIC
+@@ -289,7 +289,6 @@ config BMIPS_GENERIC
  	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
  	select HARDIRQS_SW_RESEND
  	select HAVE_PCI

+ 1 - 1
target/linux/generic/hack-6.1/220-arm-gc_sections.patch

@@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 ---
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -123,6 +123,7 @@ config ARM
+@@ -124,6 +124,7 @@ config ARM
  	select HAVE_VIRT_CPU_ACCOUNTING_GEN
  	select IRQ_FORCED_THREADING
  	select LOCK_MM_AND_FIND_VMA

+ 2 - 2
target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch

@@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1034,9 +1034,6 @@ config FW_ARC
+@@ -1035,9 +1035,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
  	bool
  
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
  config CEVT_BCM1480
  	bool
  
-@@ -3091,6 +3088,18 @@ choice
+@@ -3092,6 +3089,18 @@ choice
  		bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice
  

+ 2 - 2
target/linux/generic/pending-6.1/920-mangle_bootargs.patch

@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
  	help
 --- a/init/main.c
 +++ b/init/main.c
-@@ -609,6 +609,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -607,6 +607,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 <[email protected]>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -957,6 +980,7 @@ asmlinkage __visible void __init __no_sa
+@@ -954,6 +977,7 @@ asmlinkage __visible void __init __no_sa
  	pr_notice("%s", linux_banner);
  	early_security_init();
  	setup_arch(&command_line);

+ 2 - 2
target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch

@@ -21,7 +21,7 @@ Signed-off-by: Christian Marangi <[email protected]>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -284,6 +284,7 @@ config PHYS_OFFSET
+@@ -285,6 +285,7 @@ config PHYS_OFFSET
  	default 0x30000000 if ARCH_S3C24XX
  	default 0xa0000000 if ARCH_IOP32X || ARCH_PXA
  	default 0xc0000000 if ARCH_EP93XX || ARCH_SA1100
@@ -29,7 +29,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  	default 0
  	help
  	  Please provide the physical address corresponding to the
-@@ -1703,7 +1704,7 @@ config CRASH_DUMP
+@@ -1704,7 +1705,7 @@ config CRASH_DUMP
  
  config AUTO_ZRELADDR
  	bool "Auto calculation of the decompressed kernel image address" if !ARCH_MULTIPLATFORM

+ 3 - 3
target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch

@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <[email protected]>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1587,6 +1587,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1588,6 +1588,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.
  
@@ -248,7 +248,7 @@ Signed-off-by: Adrian Panella <[email protected]>
  }
 --- a/init/main.c
 +++ b/init/main.c
-@@ -114,6 +114,10 @@
+@@ -112,6 +112,10 @@
  
  #include <kunit/test.h>
  
@@ -259,7 +259,7 @@ Signed-off-by: Adrian Panella <[email protected]>
  static int kernel_init(void *);
  
  extern void init_IRQ(void);
-@@ -994,6 +998,18 @@ asmlinkage __visible void __init __no_sa
+@@ -991,6 +995,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();

+ 1 - 1
target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1600,6 +1600,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+@@ -1601,6 +1601,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
  
  endchoice
  

+ 1 - 1
target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1588,6 +1588,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1589,6 +1589,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
  
  endchoice
  

+ 3 - 3
target/linux/mvebu/patches-6.1/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch

@@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <[email protected]>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1586,6 +1586,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1587,6 +1587,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.
  
@@ -247,7 +247,7 @@ Signed-off-by: Michael Gray <[email protected]>
  }
 --- a/init/main.c
 +++ b/init/main.c
-@@ -114,6 +114,10 @@
+@@ -112,6 +112,10 @@
  
  #include <kunit/test.h>
  
@@ -258,7 +258,7 @@ Signed-off-by: Michael Gray <[email protected]>
  static int kernel_init(void *);
  
  extern void init_IRQ(void);
-@@ -992,6 +996,18 @@ asmlinkage __visible void __init __no_sa
+@@ -989,6 +993,18 @@ asmlinkage __visible void __init __no_sa
  	page_alloc_init();
  
  	pr_notice("Kernel command line: %s\n", saved_command_line);