projects / openwrt / staging / stintel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b8b4906)
kernel: bump 6.1 to 6.1.37
authorJohn Audia <therealgraysky@proton.me>
Sat, 1 Jul 2023 14:50:36 +0000 (10:50 -0400)
committerHauke Mehrtens <hauke@hauke-m.de>
Wed, 5 Jul 2023 18:32:37 +0000 (20:32 +0200)
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@proton.me>
include/kernel-6.1 patch | blob | history
target/linux/armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch patch | blob | history
target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch patch | blob | history
target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch patch | blob | history
target/linux/generic/backport-6.1/020-v6.3-10-UPSTREAM-mm-add-vma_has_recency.patch patch | blob | history
target/linux/generic/hack-6.1/220-arm-gc_sections.patch patch | blob | history
target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch patch | blob | history
target/linux/ipq806x/patches-6.1/0060-ARM-mach-qcom-fix-support-for-ipq806x.patch patch | blob | history
target/linux/ipq806x/patches-6.1/0067-generic-Mangle-bootloader-s-kernel-arguments.patch patch | blob | history
target/linux/ipq806x/patches-6.1/900-arm-add-cmdline-override.patch patch | blob | history

diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 2748562eba4bd94f8b89180312a3a55b8742ac43..5a672efd3237bf2d921dff29becedb7296676bbc 100644 (file)
--- 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 cb124c1cf8fde39182ac06de93df088d2808b397..ef8493fa0d8df36b0812730fc38fb7440fa80224 100644 (file)
--- 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@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 1c4a478148f3ca0c5b5ef68483b62eed73c86d98..36f8beb89f15188bc6821aba241b3ef031d3579d 100644 (file)
--- 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@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@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 66e8db4d01084d91585295fab521bd62966e4fea..e5c22bb17fda17aff40dd1fcbc8b0095f6f31a07 100644 (file)
--- 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@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 b5051d71a476b945c8799fb7851c35404f54d60f..69078629055726120f9027ca52400cb8a017138c 100644 (file)
--- 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@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 483118138e213bd0db9f71c71547096ad656cc26..b644739768d23d6f0ea304571deb224a3119b33f 100644 (file)
--- 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@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 82576d644d761499842a63c180330f5a8163faee..9e571a6d875b18d72e877ac7e3157ba0ceeecc6c 100644 (file)
--- 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@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@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 384eee6215bce50b7afb0191d17cc6bf8503fab9..40c45626106c3c02d13f7988b8822d434375b492 100644 (file)
--- 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@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@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 e40b43b968d9323c56b0eeaad60f14bd04ef6e23..15365322fb1a2e521bb7b5e5c2ece6f0004d6e06 100644 (file)
--- 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@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 6361cfcbd918f26417de5ed08546634345fe05b1..e07947f4b4857733c3f3c19a1f0fc1fd262711b8 100644 (file)
--- 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
  
Staging tree of Stijn Tintel