[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: Revert "toolchain: gcc: improve patch handling by introducing major version" iwlwifi: edit package/firmware/linux-firmware/intel.mk for support inter-ax201 (coolsnowwolf#10303) libselinux: sync with upstream (coolsnowwolf#10300) kernel: bump 6.0 to 6.0.3 (coolsnowwolf#10299)
chingxuds · Oct 22, 2022 · 8a0b740 · 8a0b740
2 parents f4229b3 + 779ed7d
commit 8a0b740
Show file tree

Hide file tree

Showing 110 changed files with 219 additions and 383 deletions.
diff --git a/include/kernel-6.0 b/include/kernel-6.0
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.0 = .2
-LINUX_KERNEL_HASH-6.0.2 = a13c26388cacccb684cd9f51109596a280c8186b7e95174d31ee7c5718e95c9d
+LINUX_VERSION-6.0 = .3
+LINUX_KERNEL_HASH-6.0.3 = b0d522241805794d8af3a67d331ba063a16496c6fb6d365d48f7ed78ee1c3dcf
diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk
@@ -175,6 +175,13 @@ define Package/iwlwifi-firmware-ax200/install
 endef
 $(eval $(call BuildPackage,iwlwifi-firmware-ax200))
 
+Package/iwlwifi-firmware-ax201 = $(call Package/firmware-default,Intel AX201 firmware)
+define Package/iwlwifi-firmware-ax201/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-hr-b0-64.ucode $(1)/lib/firmware
+endef
+$(eval $(call BuildPackage,iwlwifi-firmware-ax201))
+
 Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware)
 define Package/iwlwifi-firmware-ax210/install
 	$(INSTALL_DIR) $(1)/lib/firmware

diff --git a/package/libs/libselinux/Makefile b/package/libs/libselinux/Makefile
@@ -6,17 +6,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libselinux
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/3.2
-PKG_HASH:=df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161
+PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
+PKG_HASH:=acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057
 HOST_BUILD_DEPENDS:=libsepol/host pcre/host
 
 PKG_LICENSE:=libselinux-1.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+PKG_CPE_ID:=cpe:/a:selinuxproject:libselinux
+
+HOST_BUILD_DEPENDS:=libsepol/host pcre/host
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -107,7 +110,8 @@ HOST_LDFLAGS += -Wl,-rpath="$(STAGING_DIR_HOSTPKG)/lib"
 
 HOST_MAKE_FLAGS += \
 	PREFIX=$(STAGING_DIR_HOSTPKG) \
-	SHLIBDIR=$(STAGING_DIR_HOSTPKG)/lib
+	SHLIBDIR=$(STAGING_DIR_HOSTPKG)/lib \
+	FTS_LDLIBS=-lfts
 
 ifeq ($(CONFIG_USE_MUSL),y)
 MAKE_FLAGS += FTS_LDLIBS=-lfts

diff --git a/package/libs/libsepol/Makefile b/package/libs/libsepol/Makefile
@@ -6,14 +6,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsepol
-PKG_VERSION:=3.2
+PKG_VERSION:=3.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/3.2
-PKG_HASH:=dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508
+PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
+PKG_HASH:=2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b
 
 PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+PKG_CPE_ID:=cpe:/a:selinuxproject:libsepol
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk

diff --git a/target/linux/generic/backport-6.0/100-mm-x86-arm64-add-arch_has_hw_pte_young.patch b/target/linux/generic/backport-6.0/100-mm-x86-arm64-add-arch_has_hw_pte_young.patch
@@ -44,11 +44,9 @@ Change-Id: Ib49b44fb56df3333a2ff1fcc496fb1980b976e7a
  mm/memory.c                      | 14 +-------------
  4 files changed, 19 insertions(+), 29 deletions(-)
 
-diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
-index b5df82aa99e6..71a1af42f0e8 100644
 --- a/arch/arm64/include/asm/pgtable.h
 +++ b/arch/arm64/include/asm/pgtable.h
-@@ -1082,24 +1082,13 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
+@@ -1082,24 +1082,13 @@ static inline void update_mmu_cache(stru
   * page after fork() + CoW for pfn mappings. We don't always have a
   * hardware-managed access flag on arm64.
   */
@@ -75,11 +73,9 @@ index b5df82aa99e6..71a1af42f0e8 100644
 
  static inline bool pud_sect_supported(void)
  {
-diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 44e2d6f1dbaa..dc5f7d8ef68a 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
-@@ -1431,10 +1431,10 @@ static inline bool arch_has_pfn_modify_check(void)
+@@ -1431,10 +1431,10 @@ static inline bool arch_has_pfn_modify_c
  	return boot_cpu_has_bug(X86_BUG_L1TF);
  }
 
@@ -93,11 +89,9 @@ index 44e2d6f1dbaa..dc5f7d8ef68a 100644
  }
 
  #ifdef CONFIG_PAGE_TABLE_CHECK
-diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
-index 014ee8f0fbaa..95f408df4695 100644
 --- a/include/linux/pgtable.h
 +++ b/include/linux/pgtable.h
-@@ -260,6 +260,19 @@ static inline int pmdp_clear_flush_young(struct vm_area_struct *vma,
+@@ -260,6 +260,19 @@ static inline int pmdp_clear_flush_young
  #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
  #endif
 
@@ -117,8 +111,6 @@ index 014ee8f0fbaa..95f408df4695 100644
  #ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR
  static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
  				       unsigned long address,
-diff --git a/mm/memory.c b/mm/memory.c
-index a78814413ac0..68294ce1cb06 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -125,18 +125,6 @@ int randomize_va_space __read_mostly =
@@ -140,7 +132,7 @@ index a78814413ac0..68294ce1cb06 100644
  #ifndef arch_wants_old_prefaulted_pte
  static inline bool arch_wants_old_prefaulted_pte(void)
  {
-@@ -2870,7 +2858,7 @@ static inline bool __wp_page_copy_user(struct page *dst, struct page *src,
+@@ -2872,7 +2860,7 @@ static inline bool __wp_page_copy_user(s
  	 * On architectures with software "accessed" bits, we would
  	 * take a double page fault, so mark it accessed here.
  	 */
@@ -149,6 +141,3 @@ index a78814413ac0..68294ce1cb06 100644
  		pte_t entry;
 
  		vmf->pte = pte_offset_map_lock(mm, vmf->pmd, addr, &vmf->ptl);
--- 
-2.17.1
-
diff --git a/target/linux/generic/backport-6.0/101-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch b/target/linux/generic/backport-6.0/101-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch
@@ -50,8 +50,6 @@ Change-Id: I1a17be3ae926f721f7b17ea1539e5c39e8c4f9a8
  include/linux/pgtable.h        | 4 ++--
  5 files changed, 17 insertions(+), 4 deletions(-)
 
-diff --git a/arch/Kconfig b/arch/Kconfig
-index 8b311e400ec1..bf19a84fffa2 100644
 --- a/arch/Kconfig
 +++ b/arch/Kconfig
 @@ -1418,6 +1418,14 @@ config DYNAMIC_SIGFRAME
@@ -69,8 +67,6 @@ index 8b311e400ec1..bf19a84fffa2 100644
  source "kernel/gcov/Kconfig"
 
  source "scripts/gcc-plugins/Kconfig"
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index f9920f1341c8..674d694a665e 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
 @@ -85,6 +85,7 @@ config X86
@@ -81,11 +77,9 @@ index f9920f1341c8..674d694a665e 100644
  	select ARCH_HAS_UACCESS_FLUSHCACHE	if X86_64
  	select ARCH_HAS_COPY_MC			if X86_64
  	select ARCH_HAS_SET_MEMORY
-diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index dc5f7d8ef68a..5059799bebe3 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
-@@ -815,7 +815,8 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)
+@@ -815,7 +815,8 @@ static inline unsigned long pmd_page_vad
 
  static inline int pmd_bad(pmd_t pmd)
  {
@@ -95,11 +89,9 @@ index dc5f7d8ef68a..5059799bebe3 100644
  }
 
  static inline unsigned long pages_to_mb(unsigned long npg)
-diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index a932d7712d85..8525f2876fb4 100644
 --- a/arch/x86/mm/pgtable.c
 +++ b/arch/x86/mm/pgtable.c
-@@ -550,7 +550,7 @@ int ptep_test_and_clear_young(struct vm_area_struct *vma,
+@@ -550,7 +550,7 @@ int ptep_test_and_clear_young(struct vm_
  	return ret;
  }
 
@@ -108,7 +100,7 @@ index a932d7712d85..8525f2876fb4 100644
  int pmdp_test_and_clear_young(struct vm_area_struct *vma,
  			      unsigned long addr, pmd_t *pmdp)
  {
-@@ -562,6 +562,9 @@ int pmdp_test_and_clear_young(struct vm_area_struct *vma,
+@@ -562,6 +562,9 @@ int pmdp_test_and_clear_young(struct vm_
 
  	return ret;
  }
@@ -118,11 +110,9 @@ index a932d7712d85..8525f2876fb4 100644
  int pudp_test_and_clear_young(struct vm_area_struct *vma,
  			      unsigned long addr, pud_t *pudp)
  {
-diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
-index 95f408df4695..d9095251bffd 100644
 --- a/include/linux/pgtable.h
 +++ b/include/linux/pgtable.h
-@@ -213,7 +213,7 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
+@@ -213,7 +213,7 @@ static inline int ptep_test_and_clear_yo
  #endif
 
  #ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG
@@ -131,7 +121,7 @@ index 95f408df4695..d9095251bffd 100644
  static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,
  					    unsigned long address,
  					    pmd_t *pmdp)
-@@ -234,7 +234,7 @@ static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,
+@@ -234,7 +234,7 @@ static inline int pmdp_test_and_clear_yo
  	BUILD_BUG();
  	return 0;
  }
@@ -140,6 +130,3 @@ index 95f408df4695..d9095251bffd 100644
  #endif
 
  #ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
--- 
-2.17.1
-
diff --git a/target/linux/generic/backport-6.0/102-mm-vmscan.c-refactor-shrink_node.patch b/target/linux/generic/backport-6.0/102-mm-vmscan.c-refactor-shrink_node.patch
@@ -29,8 +29,6 @@ Change-Id: Iae734b5b4030205b7db6e8c841f747b6f6ae1a04
  mm/vmscan.c | 198 +++++++++++++++++++++++++++-------------------------
  1 file changed, 104 insertions(+), 94 deletions(-)
 
-diff --git a/mm/vmscan.c b/mm/vmscan.c
-index 382dbe97329f..4e4331367db9 100644
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
 @@ -2728,6 +2728,109 @@ enum scan_balance {
@@ -143,7 +141,7 @@ index 382dbe97329f..4e4331367db9 100644
  /*
   * Determine how aggressively the anon and file LRU lists should be
   * scanned.
-@@ -3197,109 +3300,16 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)
+@@ -3197,109 +3300,16 @@ static void shrink_node(pg_data_t *pgdat
  	unsigned long nr_reclaimed, nr_scanned;
  	struct lruvec *target_lruvec;
  	bool reclaimable = false;
@@ -254,6 +252,3 @@ index 382dbe97329f..4e4331367db9 100644
 
  	shrink_node_memcgs(pgdat, sc);
 
--- 
-2.17.1
-
diff --git a/...linux/generic/backport-6.0/103-Revert-include-linux-mm_inline.h-fold-__update_lru_s.patch b/...linux/generic/backport-6.0/103-Revert-include-linux-mm_inline.h-fold-__update_lru_s.patch
@@ -32,11 +32,9 @@ Change-Id: I6155c407d50199a43b179c7f45904d4b7c052118
  include/linux/mm_inline.h | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
-index 7b25b53c474a..fb8aadb81cd6 100644
 --- a/include/linux/mm_inline.h
 +++ b/include/linux/mm_inline.h
-@@ -34,7 +34,7 @@ static inline int page_is_file_lru(struct page *page)
+@@ -34,7 +34,7 @@ static inline int page_is_file_lru(struc
  	return folio_is_file_lru(page_folio(page));
  }
 
@@ -45,7 +43,7 @@ index 7b25b53c474a..fb8aadb81cd6 100644
  				enum lru_list lru, enum zone_type zid,
  				long nr_pages)
  {
-@@ -43,6 +43,13 @@ static __always_inline void update_lru_size(struct lruvec *lruvec,
+@@ -43,6 +43,13 @@ static __always_inline void update_lru_s
  	__mod_lruvec_state(lruvec, NR_LRU_BASE + lru, nr_pages);
  	__mod_zone_page_state(&pgdat->node_zones[zid],
  				NR_ZONE_LRU_BASE + lru, nr_pages);
@@ -59,6 +57,3 @@ index 7b25b53c474a..fb8aadb81cd6 100644
  #ifdef CONFIG_MEMCG
  	mem_cgroup_update_lru_size(lruvec, lru, zid, nr_pages);
  #endif
--- 
-2.17.1
-