[openwrt/openwrt] kernel: bump 6.1 to 6.1.37

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 5 11:35:01 PDT 2023 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/79a82d7e8734bf9e5b7cd12efcda0f18b4ba378a

commit 79a82d7e8734bf9e5b7cd12efcda0f18b4ba378a
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Sat Jul 1 10:50:36 2023 -0400

    kernel: bump 6.1 to 6.1.37
    
    Manually rebased:
            generic/hack-6.1/220-arm-gc_sections.patch
            armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch
    
    All other patches automatically rebased.
    
    Signed-off-by: John Audia <therealgraysky at proton.me>
---
 include/kernel-6.1                                                    | 4 ++--
 .../linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch | 4 ++--
 .../bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch      | 4 ++--
 target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch   | 2 +-
 .../backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch    | 2 +-
 target/linux/generic/hack-6.1/220-arm-gc_sections.patch               | 4 ++--
 target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch       | 4 ++--
 .../patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch      | 4 ++--
 .../0067-generic-Mangle-bootloader-s-kernel-arguments.patch           | 2 +-
 target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch   | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 2748562eba..5a672efd32 100644
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .36
-LINUX_KERNEL_HASH-6.1.36 = d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b
\ No newline at end of file
+LINUX_VERSION-6.1 = .37
+LINUX_KERNEL_HASH-6.1.37 = 46cad712d261a23c8e483a3b79b6a84b9a5f731a8921c9127df35ae35cef1e80
\ No newline at end of file
diff --git a/target/linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch b/target/linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch
index cb124c1cf8..ef8493fa0d 100644
--- a/target/linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch
+++ b/target/linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch
@@ -13,10 +13,10 @@ Signed-off-by: Mathew McBride <matt at traverse.com.au>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -122,7 +122,6 @@ config ARM
- 	select HAVE_UID16
+@@ -123,7 +123,6 @@ config ARM
  	select HAVE_VIRT_CPU_ACCOUNTING_GEN
  	select IRQ_FORCED_THREADING
+ 	select LOCK_MM_AND_FIND_VMA
 -	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
  	select MODULES_USE_ELF_REL
  	select NEED_DMA_MAP_STATE
diff --git a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
index 1c4a478148..36f8beb89f 100644
--- a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
+++ b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -273,19 +273,13 @@ config BMIPS_GENERIC
+@@ -274,19 +274,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 <noltari at gmail.com>
  	select SWAP_IO_SPACE
  	select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
  	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
-@@ -295,6 +289,7 @@ config BMIPS_GENERIC
+@@ -296,6 +290,7 @@ config BMIPS_GENERIC
  	select HAVE_PCI
  	select PCI_DRIVERS_GENERIC
  	select FW_CFE
diff --git a/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch b/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
index 66e8db4d01..e5c22bb17f 100644
--- a/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
+++ b/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
@@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -287,7 +287,6 @@ config BMIPS_GENERIC
+@@ -288,7 +288,6 @@ config BMIPS_GENERIC
  	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
  	select HARDIRQS_SW_RESEND
  	select HAVE_PCI
diff --git a/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch b/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch
index b5051d71a4..6907862905 100644
--- a/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch
+++ b/target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch
@@ -87,7 +87,7 @@ Signed-off-by: T.J. Mercier <tjmercier at google.com>
  					mark_page_accessed(page);
  			}
  			rss[mm_counter(page)]--;
-@@ -5170,8 +5169,8 @@ static inline void mm_account_fault(stru
+@@ -5182,8 +5181,8 @@ static inline void mm_account_fault(stru
  #ifdef CONFIG_LRU_GEN
  static void lru_gen_enter_fault(struct vm_area_struct *vma)
  {
diff --git a/target/linux/generic/hack-6.1/220-arm-gc_sections.patch b/target/linux/generic/hack-6.1/220-arm-gc_sections.patch
index 483118138e..b644739768 100644
--- a/target/linux/generic/hack-6.1/220-arm-gc_sections.patch
+++ b/target/linux/generic/hack-6.1/220-arm-gc_sections.patch
@@ -12,10 +12,10 @@ Signed-off-by: Gabor Juhos <juhosg at openwrt.org>
 ---
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -122,6 +122,7 @@ config ARM
- 	select HAVE_UID16
+@@ -123,6 +123,7 @@ config ARM
  	select HAVE_VIRT_CPU_ACCOUNTING_GEN
  	select IRQ_FORCED_THREADING
+ 	select LOCK_MM_AND_FIND_VMA
 +	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
  	select MODULES_USE_ELF_REL
  	select NEED_DMA_MAP_STATE
diff --git a/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch
index 82576d644d..9e571a6d87 100644
--- a/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch
@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob at landley.net>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1033,9 +1033,6 @@ config FW_ARC
+@@ -1034,9 +1034,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
  	bool
  
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob at landley.net>
  config CEVT_BCM1480
  	bool
  
-@@ -3090,6 +3087,18 @@ choice
+@@ -3091,6 +3088,18 @@ choice
  		bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice
  
diff --git a/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch b/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch
index 384eee6215..40c4562610 100644
--- a/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch
+++ b/target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch
@@ -21,7 +21,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -283,6 +283,7 @@ config PHYS_OFFSET
+@@ -284,6 +284,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 <ansuelsmth at gmail.com>
  	default 0
  	help
  	  Please provide the physical address corresponding to the
-@@ -1702,7 +1703,7 @@ config CRASH_DUMP
+@@ -1703,7 +1704,7 @@ config CRASH_DUMP
  
  config AUTO_ZRELADDR
  	bool "Auto calculation of the decompressed kernel image address" if !ARCH_MULTIPLATFORM
diff --git a/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
index e40b43b968..15365322fb 100644
--- a/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
+++ b/target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74 at outlook.com>
 
 --- 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.
  
diff --git a/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch
index 6361cfcbd9..e07947f4b4 100644
--- a/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch
+++ b/target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1599,6 +1599,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+@@ -1600,6 +1600,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
  
  endchoice

More information about the lede-commits mailing list