From 79a82d7e8734bf9e5b7cd12efcda0f18b4ba378a Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 1 Jul 2023 10:50:36 -0400 Subject: 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 --- .../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 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic') 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 b5051d71a47..69078629055 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 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 483118138e2..b644739768d 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 --- --- 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 82576d644d7..9e571a6d875 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 --- --- 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 config CEVT_BCM1480 bool -@@ -3090,6 +3087,18 @@ choice +@@ -3091,6 +3088,18 @@ choice bool "Extend builtin kernel arguments with bootloader arguments" endchoice -- cgit v1.2.3