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

* https://github.com/coolsnowwolf/lede:
  ntfs3-mount: drop ntfs3-oot
  fs: port ntfs3 from kernel 5.19 to 5.10
  fs: port ntfs3 from kernel 5.19 to 5.4
  toolchain/gcc: GCC12 sync upstream (coolsnowwolf#10080)
  ath11k-firmware: WCN6855: fix firmware link (coolsnowwolf#10078)
  kernel: fixes build error and refresh 5.15 patches (coolsnowwolf#10074)

Author: github-actions[bot]

package/firmware/ath11k-firmware/Makefile

@@ -103,7 +103,7 @@ define Package/ath11k-firmware-wcn6855/install
 	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/WCN6855/hw2.0/regdb.bin \
 		$(1)/lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin
-	$(LN) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
+	$(LN) ./hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
 endef
 
 $(eval $(call BuildPackage,ath11k-firmware-ipq6018))

package/kernel/linux/modules/fs.mk

@@ -530,7 +530,7 @@ $(eval $(call KernelPackage,fs-ntfs))
 define KernelPackage/fs-ntfs3
   SUBMENU:=$(FS_MENU)
   TITLE:=NTFS3 Read-Write file system support
-  DEPENDS:=@(LINUX_5_15||LINUX_5_19) +kmod-nls-base
+  DEPENDS:=@(LINUX_5_4||LINUX_5_10||LINUX_5_15||LINUX_5_19) +kmod-nls-base
   KCONFIG:= \
 	CONFIG_NTFS3_FS \
 	CONFIG_NTFS3_64BIT_CLUSTER=y \

package/lean/ntfs3-mount/Makefile

@@ -10,7 +10,7 @@ define Package/ntfs3-mount
   CATEGORY:=Utilities
   SUBMENU:=Filesystem
   TITLE:=NTFS mount script for Paragon NTFS3 driver
-  DEPENDS:=+LINUX_5_4:kmod-fs-ntfs3-oot +(LINUX_5_15||LINUX_5_19):kmod-fs-ntfs3
+  DEPENDS:=+kmod-fs-ntfs3
   PKGARCH:=all
 endef
 

target/linux/ath79/patches-5.15/408-mtd-redboot_partition_scan.patch

@@ -1,6 +1,6 @@
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru
+@@ -91,12 +91,18 @@ static int parse_redboot_partitions(stru
 
  	parse_redboot_of(master);
 
@@ -19,7 +19,7 @@
  				return -EIO;
  			}
  			offset -= master->erasesize;
-@@ -108,10 +114,6 @@ nogood:
+@@ -109,10 +115,6 @@ nogood:
  				goto nogood;
  		}
  	}
@@ -30,7 +30,7 @@
 
  	pr_notice("Searching for RedBoot partition table in %s at offset 0x%lx\n",
  		  master->name, offset);
-@@ -183,6 +185,12 @@ nogood:
+@@ -184,6 +186,12 @@ nogood:
  	}
  	if (i == numslots) {
  		/* Didn't find it */

target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch

@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1874,6 +1874,27 @@ static int advk_pcie_remove(struct platf
+@@ -1889,6 +1889,27 @@ static int advk_pcie_remove(struct platf
  	advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
  	advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
 

target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch

@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1912,6 +1912,9 @@ static int advk_pcie_remove(struct platf
+@@ -1927,6 +1927,9 @@ static int advk_pcie_remove(struct platf
  	val &= ~LINK_TRAINING_EN;
  	advk_writel(pcie, val, PCIE_CORE_CTRL0_REG);
 

target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch

@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1915,6 +1915,10 @@ static int advk_pcie_remove(struct platf
+@@ -1930,6 +1930,10 @@ static int advk_pcie_remove(struct platf
  	/* Free config space for emulated root bridge */
  	pci_bridge_emul_cleanup(&pcie->bridge);
 

target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch

@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1919,6 +1919,11 @@ static int advk_pcie_remove(struct platf
+@@ -1934,6 +1934,11 @@ static int advk_pcie_remove(struct platf
  	if (pcie->reset_gpio)
  		gpiod_set_value_cansleep(pcie->reset_gpio, 1);
 

target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch

@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1634,6 +1634,9 @@ static int advk_pcie_enable_phy(struct a
+@@ -1649,6 +1649,9 @@ static int advk_pcie_enable_phy(struct a
  		return ret;
  	}
 

target/linux/generic/files-5.10/fs/ntfs3/Kconfig

@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config NTFS3_FS
+	tristate "NTFS Read-Write file system support"
+	select NLS
+	help
+	  Windows OS native file system (NTFS) support up to NTFS version 3.1.
+
+	  Y or M enables the NTFS3 driver with full features enabled (read,
+	  write, journal replaying, sparse/compressed files support).
+	  File system type to use on mount is "ntfs3". Module name (M option)
+	  is also "ntfs3".
+
+	  Documentation: <file:Documentation/filesystems/ntfs3.rst>
+
+config NTFS3_64BIT_CLUSTER
+	bool "64 bits per NTFS clusters"
+	depends on NTFS3_FS && 64BIT
+	help
+	  Windows implementation of ntfs.sys uses 32 bits per clusters.
+	  If activated 64 bits per clusters you will be able to use 4k cluster
+	  for 16T+ volumes. Windows will not be able to mount such volumes.
+
+	  It is recommended to say N here.
+
+config NTFS3_LZX_XPRESS
+	bool "activate support of external compressions lzx/xpress"
+	depends on NTFS3_FS
+	help
+	  In Windows 10 one can use command "compact" to compress any files.
+	  4 possible variants of compression are: xpress4k, xpress8k, xpress16k and lzx.
+	  If activated you will be able to read such files correctly.
+
+	  It is recommended to say Y here.
+
+config NTFS3_FS_POSIX_ACL
+	bool "NTFS POSIX Access Control Lists"
+	depends on NTFS3_FS
+	select FS_POSIX_ACL
+	help
+	  POSIX Access Control Lists (ACLs) support additional access rights
+	  for users and groups beyond the standard owner/group/world scheme,
+	  and this option selects support for ACLs specifically for ntfs
+	  filesystems.
+	  NOTE: this is linux only feature. Windows will ignore these ACLs.
+
+	  If you don't know what Access Control Lists are, say N.

target/linux/generic/files-5.10/fs/ntfs3/Makefile

@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for the ntfs3 filesystem support.
+#
+
+# to check robot warnings
+ccflags-y += -Wint-to-pointer-cast \
+	$(call cc-option,-Wunused-but-set-variable,-Wunused-const-variable) \
+	$(call cc-option,-Wold-style-declaration,-Wout-of-line-declaration)
+
+obj-$(CONFIG_NTFS3_FS) += ntfs3.o
+
+ntfs3-y :=	attrib.o \
+		attrlist.o \
+		bitfunc.o \
+		bitmap.o \
+		dir.o \
+		fsntfs.o \
+		frecord.o \
+		file.o \
+		fslog.o \
+		inode.o \
+		index.o \
+		lznt.o \
+		namei.o \
+		record.o \
+		run.o \
+		super.o \
+		upcase.o \
+		xattr.o
+
+ntfs3-$(CONFIG_NTFS3_LZX_XPRESS) += $(addprefix lib/,\
+		decompress_common.o \
+		lzx_decompress.o \
+		xpress_decompress.o \
+		)
+
+ccflags-$(CONFIG_NTFS3_LZX_XPRESS) += -DCONFIG_NTFS3_LZX_XPRESS
+ccflags-$(CONFIG_NTFS3_FS_POSIX_ACL) += -DCONFIG_NTFS3_FS_POSIX_ACL
+
+all:
+	make -C /lib/modules/$(KVERSION)/build M=$(PWD) modules
+
+clean:
+	make -C /lib/modules/$(KVERSION)/build M=$(PWD) clean