generic: 6.12: refresh pending patches

Refreshed patches for generic/pending-6.12 by running
make target/linux/refresh

Signed-off-by: Mieczyslaw Nalewaj <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16547
Signed-off-by: Christian Marangi <[email protected]>

target/linux/generic/pending-6.12/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/include/linux/compiler.h
 +++ b/include/linux/compiler.h
-@@ -202,6 +202,8 @@ void ftrace_likely_update(struct ftrace_
+@@ -191,6 +191,8 @@ void ftrace_likely_update(struct ftrace_
  	__v;								\
  })
  
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif /* __KERNEL__ */
  
  /**
-@@ -258,6 +260,4 @@ static inline void *offset_to_ptr(const
+@@ -306,6 +308,4 @@ static inline void *offset_to_ptr(const
   */
  #define prevent_tail_call_optimization()	mb()
  

target/linux/generic/pending-6.12/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch

@@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/fs/jffs2/dir.c
 +++ b/fs/jffs2/dir.c
-@@ -617,8 +617,8 @@ static int jffs2_rmdir (struct inode *di
+@@ -620,8 +620,8 @@ static int jffs2_rmdir (struct inode *di
  	return ret;
  }
  
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  {
  	struct jffs2_inode_info *f, *dir_f;
  	struct jffs2_sb_info *c;
-@@ -758,7 +758,11 @@ static int jffs2_mknod (struct mnt_idmap
+@@ -761,7 +761,11 @@ static int jffs2_mknod (struct mnt_idmap
  	mutex_unlock(&dir_f->sem);
  	jffs2_complete_reservation(c);
  
@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	return 0;
  
   fail:
-@@ -766,6 +770,19 @@ static int jffs2_mknod (struct mnt_idmap
+@@ -769,6 +773,19 @@ static int jffs2_mknod (struct mnt_idmap
  	return ret;
  }
  
@@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static int jffs2_rename (struct mnt_idmap *idmap,
  			 struct inode *old_dir_i, struct dentry *old_dentry,
  			 struct inode *new_dir_i, struct dentry *new_dentry,
-@@ -777,7 +794,7 @@ static int jffs2_rename (struct mnt_idma
+@@ -780,7 +797,7 @@ static int jffs2_rename (struct mnt_idma
  	uint8_t type;
  	uint32_t now;
  
@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		return -EINVAL;
  
  	/* The VFS will check for us and prevent trying to rename a
-@@ -843,9 +860,14 @@ static int jffs2_rename (struct mnt_idma
+@@ -846,9 +863,14 @@ static int jffs2_rename (struct mnt_idma
  	if (d_is_dir(old_dentry) && !victim_f)
  		inc_nlink(new_dir_i);
  

target/linux/generic/pending-6.12/205-backtrace_module_info.patch

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
-@@ -982,8 +982,10 @@ char *symbol_string(char *buf, char *end
+@@ -983,8 +983,10 @@ char *symbol_string(char *buf, char *end
  		    struct printf_spec spec, const char *fmt)
  {
  	unsigned long value;
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif
  
  	if (fmt[1] == 'R')
-@@ -1004,8 +1006,14 @@ char *symbol_string(char *buf, char *end
+@@ -1005,8 +1007,14 @@ char *symbol_string(char *buf, char *end
  
  	return string_nocheck(buf, end, sym, spec);
  #else

target/linux/generic/pending-6.12/300-mips_expose_boot_raw.patch

@@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1013,9 +1013,6 @@ config FW_ARC
+@@ -1055,9 +1055,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
  	bool
  
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
  config CEVT_BCM1480
  	bool
  
-@@ -2996,6 +2993,18 @@ choice
+@@ -2990,6 +2987,18 @@ choice
  		bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice
  

target/linux/generic/pending-6.12/310-arm_module_unresolved_weak_sym.patch

@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/arch/arm/kernel/module.c
 +++ b/arch/arm/kernel/module.c
-@@ -146,6 +146,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+@@ -112,6 +112,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
  			return -ENOEXEC;
  		}
  

target/linux/generic/pending-6.12/333-arc-enable-unaligned-access-in-kernel-mode.patch

@@ -13,7 +13,7 @@ Signed-off-by: Alexey Brodkin <[email protected]>
 
 --- a/arch/arc/kernel/unaligned.c
 +++ b/arch/arc/kernel/unaligned.c
-@@ -202,7 +202,7 @@ int misaligned_fixup(unsigned long addre
+@@ -203,7 +203,7 @@ int misaligned_fixup(unsigned long addre
  	char buf[TASK_COMM_LEN];
  
  	/* handle user mode only and only if enabled by sysadmin */

target/linux/generic/pending-6.12/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch

@@ -14,7 +14,7 @@ Signed-off-by: Pawel Dembicki <[email protected]>
 
 --- a/arch/powerpc/Kconfig
 +++ b/arch/powerpc/Kconfig
-@@ -251,7 +251,7 @@ config PPC
+@@ -254,7 +254,7 @@ config PPC
  	select HAVE_KERNEL_GZIP
  	select HAVE_KERNEL_LZMA			if DEFAULT_UIMAGE
  	select HAVE_KERNEL_LZO			if DEFAULT_UIMAGE

target/linux/generic/pending-6.12/350-mips-kernel-fix-detect_memory_region-function.patch

@@ -31,7 +31,7 @@ Signed-off-by: Shiji Yang <[email protected]>
  extern void prom_free_prom_memory(void);
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c
-@@ -90,21 +90,27 @@ static struct resource bss_resource = {
+@@ -86,21 +86,27 @@ static struct resource bss_resource = {
  unsigned long __kaslr_offset __ro_after_init;
  EXPORT_SYMBOL(__kaslr_offset);
  
@@ -64,7 +64,7 @@ Signed-off-by: Shiji Yang <[email protected]>
  	}
  
  	pr_debug("Memory: %lluMB of RAM detected at 0x%llx (min: %lluMB, max: %lluMB)\n",
-@@ -115,6 +121,7 @@ void __init detect_memory_region(phys_ad
+@@ -111,6 +117,7 @@ void __init detect_memory_region(phys_ad
  
  	memblock_add(start, size);
  }

target/linux/generic/pending-6.12/400-mtd-mtdsplit-support.patch

@@ -230,7 +230,7 @@ Subject: [PATCH] mtd: mtdsplit support
  		mtd_add_partition_attrs(child);
  
  		/* Look for subpartitions */
-@@ -439,31 +584,6 @@ err_del_partitions:
+@@ -443,31 +588,6 @@ err_del_partitions:
  	return ret;
  }
  

target/linux/generic/pending-6.12/401-mtd-don-t-register-NVMEM-devices-for-partitions-with.patch

@@ -16,7 +16,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -548,6 +548,29 @@ static int mtd_nvmem_add(struct mtd_info
+@@ -549,6 +549,29 @@ static int mtd_nvmem_add(struct mtd_info
  	struct device_node *node = mtd_get_of_node(mtd);
  	struct nvmem_config config = {};
  

target/linux/generic/pending-6.12/430-mtd-add-myloader-partition-parser.patch

@@ -10,7 +10,7 @@ Signed-off-by: Adrian Schmutzler <[email protected]>
 
 --- a/drivers/mtd/parsers/Kconfig
 +++ b/drivers/mtd/parsers/Kconfig
-@@ -67,6 +67,22 @@ config MTD_CMDLINE_PARTS
+@@ -62,6 +62,22 @@ config MTD_CMDLINE_PARTS
  
  	  If unsure, say 'N'.
  
@@ -35,7 +35,7 @@ Signed-off-by: Adrian Schmutzler <[email protected]>
  	default y
 --- a/drivers/mtd/parsers/Makefile
 +++ b/drivers/mtd/parsers/Makefile
-@@ -4,6 +4,7 @@ obj-$(CONFIG_MTD_BCM47XX_PARTS)		+= bcm4
+@@ -3,6 +3,7 @@ obj-$(CONFIG_MTD_BCM47XX_PARTS)		+= bcm4
  obj-$(CONFIG_MTD_BCM63XX_PARTS)		+= bcm63xxpart.o
  obj-$(CONFIG_MTD_BRCM_U_BOOT)		+= brcm_u-boot.o
  obj-$(CONFIG_MTD_CMDLINE_PARTS)		+= cmdlinepart.o

target/linux/generic/pending-6.12/435-mtd-add-routerbootpart-parser-config.patch

@@ -16,7 +16,7 @@ Signed-off-by: Thibaut VARÈNE <[email protected]>
 
 --- a/drivers/mtd/parsers/Kconfig
 +++ b/drivers/mtd/parsers/Kconfig
-@@ -236,3 +236,12 @@ config MTD_SERCOMM_PARTS
+@@ -231,3 +231,12 @@ config MTD_SERCOMM_PARTS
  	  partition map. This partition table contains real partition
  	  offsets, which may differ from device to device depending on the
  	  number and location of bad blocks on NAND.
@@ -31,7 +31,7 @@ Signed-off-by: Thibaut VARÈNE <[email protected]>
 +	 formatted DTS.
 --- a/drivers/mtd/parsers/Makefile
 +++ b/drivers/mtd/parsers/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_SERCOMM_PARTS)		+= scpa
+@@ -16,3 +16,4 @@ obj-$(CONFIG_MTD_SERCOMM_PARTS)		+= scpa
  obj-$(CONFIG_MTD_SHARPSL_PARTS)		+= sharpslpart.o
  obj-$(CONFIG_MTD_REDBOOT_PARTS)		+= redboot.o
  obj-$(CONFIG_MTD_QCOMSMEM_PARTS)	+= qcomsmempart.o

target/linux/generic/pending-6.12/452-block-add-support-for-notifications.patch

@@ -44,7 +44,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/block/Kconfig
 +++ b/block/Kconfig
-@@ -208,6 +208,12 @@ config BLK_INLINE_ENCRYPTION_FALLBACK
+@@ -209,6 +209,12 @@ config BLK_INLINE_ENCRYPTION_FALLBACK
  	  by falling back to the kernel crypto API when inline
  	  encryption hardware is not present.
  
@@ -59,7 +59,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  config BLK_MQ_PCI
 --- a/block/Makefile
 +++ b/block/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_BLK_INLINE_ENCRYPTION)	+= b
+@@ -38,3 +38,4 @@ obj-$(CONFIG_BLK_INLINE_ENCRYPTION)	+= b
  					   blk-crypto-sysfs.o
  obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK)	+= blk-crypto-fallback.o
  obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED)	+= holder.o
@@ -156,7 +156,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 +device_initcall(blk_notifications_init);
 --- a/include/linux/blkdev.h
 +++ b/include/linux/blkdev.h
-@@ -1567,4 +1567,15 @@ struct io_comp_batch {
+@@ -1696,4 +1696,15 @@ static inline bool bdev_can_atomic_write
  
  #define DEFINE_IO_COMP_BATCH(name)	struct io_comp_batch name = { }
  

target/linux/generic/pending-6.12/453-block-add-new-genhd-flag-GENHD_FL_NVMEM.patch

@@ -40,7 +40,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/include/linux/blkdev.h
 +++ b/include/linux/blkdev.h
-@@ -80,11 +80,13 @@ struct partition_meta_info {
+@@ -82,11 +82,13 @@ struct partition_meta_info {
   * ``GENHD_FL_NO_PART``: partition support is disabled.  The kernel will not
   * scan for partitions from add_disk, and users can't add partitions manually.
   *

target/linux/generic/pending-6.12/456-mmc-core-set-card-fwnode_handle.patch

@@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/mmc/core/bus.c
 +++ b/drivers/mmc/core/bus.c
-@@ -366,6 +366,8 @@ int mmc_add_card(struct mmc_card *card)
+@@ -368,6 +368,8 @@ int mmc_add_card(struct mmc_card *card)
  
  	mmc_add_card_debugfs(card);
  	card->dev.of_node = mmc_of_find_child_device(card->host, 0);

target/linux/generic/pending-6.12/457-mmc-block-set-fwnode-of-disk-devices.patch

@@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -2620,6 +2620,10 @@ static struct mmc_blk_data *mmc_blk_allo
+@@ -2678,6 +2678,10 @@ static struct mmc_blk_data *mmc_blk_allo
  	if (area_type == MMC_BLK_DATA_AREA_MAIN)
  		dev_set_drvdata(&card->dev, md);
  	disk_fwnode = mmc_blk_get_partitions_node(parent, subname);

target/linux/generic/pending-6.12/458-mmc-block-set-GENHD_FL_NVMEM.patch

@@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -2566,6 +2566,7 @@ static struct mmc_blk_data *mmc_blk_allo
+@@ -2644,6 +2644,7 @@ static struct mmc_blk_data *mmc_blk_allo
  	md->disk->major	= MMC_BLOCK_MAJOR;
  	md->disk->minors = perdev_minors;
  	md->disk->first_minor = devidx * perdev_minors;

target/linux/generic/pending-6.12/465-m25p80-mx-disable-software-protection.patch

@@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/mtd/spi-nor/macronix.c
 +++ b/drivers/mtd/spi-nor/macronix.c
-@@ -114,6 +114,7 @@ static int macronix_nor_late_init(struct
+@@ -194,6 +194,7 @@ static int macronix_nor_late_init(struct
  {
  	if (!nor->params->set_4byte_addr_mode)
  		nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode_en4b_ex4b;

target/linux/generic/pending-6.12/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch

@@ -49,7 +49,7 @@ Submitted-by: Daniel Danzberger <[email protected]>
  obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
 --- a/drivers/mtd/nand/spi/core.c
 +++ b/drivers/mtd/nand/spi/core.c
-@@ -940,6 +940,7 @@ static const struct spinand_manufacturer
+@@ -1112,6 +1112,7 @@ static const struct spinand_manufacturer
  	&alliancememory_spinand_manufacturer,
  	&ato_spinand_manufacturer,
  	&esmt_c8_spinand_manufacturer,

target/linux/generic/pending-6.12/491-ubi-auto-create-ubiblock-device-for-rootfs.patch

@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -570,10 +570,47 @@ match_volume_desc(struct ubi_volume_info
+@@ -575,10 +575,47 @@ match_volume_desc(struct ubi_volume_info
  	return true;
  }
  
@@ -56,7 +56,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  	struct ubiblock_param *p;
  
  	/*
-@@ -586,6 +623,7 @@ ubiblock_create_from_param(struct ubi_vo
+@@ -591,6 +628,7 @@ ubiblock_create_from_param(struct ubi_vo
  		if (!match_volume_desc(vi, p->name, p->ubi_num, p->vol_id))
  			continue;
  
@@ -64,7 +64,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		ret = ubiblock_create(vi);
  		if (ret) {
  			pr_err(
-@@ -594,6 +632,10 @@ ubiblock_create_from_param(struct ubi_vo
+@@ -599,6 +637,10 @@ ubiblock_create_from_param(struct ubi_vo
  		}
  		break;
  	}

target/linux/generic/pending-6.12/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch

@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
-@@ -248,7 +248,30 @@ retry:
+@@ -250,7 +250,30 @@ retry:
  out:
  	put_page(page);
  }
@@ -40,7 +40,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  #ifdef CONFIG_ROOT_NFS
  
  #define NFSROOT_TIMEOUT_MIN	5
-@@ -385,6 +408,11 @@ static inline void mount_block_root(char
+@@ -387,6 +410,11 @@ static inline void mount_block_root(char
  
  void __init mount_root(char *root_device_name)
  {

target/linux/generic/pending-6.12/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch

@@ -16,7 +16,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  
  #include "ubi-media.h"
  #include "ubi.h"
-@@ -428,6 +429,15 @@ int ubiblock_create(struct ubi_volume_in
+@@ -431,6 +432,15 @@ int ubiblock_create(struct ubi_volume_in
  	dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
  		 dev->ubi_num, dev->vol_id, vi->name);
  	mutex_unlock(&devices_mutex);

target/linux/generic/pending-6.12/494-mtd-ubi-add-EOF-marker-support.patch

@@ -50,7 +50,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  		break;
 --- a/drivers/mtd/ubi/ubi.h
 +++ b/drivers/mtd/ubi/ubi.h
-@@ -780,6 +780,7 @@ struct ubi_attach_info {
+@@ -778,6 +778,7 @@ struct ubi_attach_info {
  	int mean_ec;
  	uint64_t ec_sum;
  	int ec_count;

target/linux/generic/pending-6.12/499-mtd-spi-nor-disable-16-bit-sr-for-macronix.patch

@@ -20,7 +20,7 @@ Signed-off-by: Nick Hainke <[email protected]>
 
 --- a/drivers/mtd/spi-nor/macronix.c
 +++ b/drivers/mtd/spi-nor/macronix.c
-@@ -115,6 +115,7 @@ static int macronix_nor_late_init(struct
+@@ -195,6 +195,7 @@ static int macronix_nor_late_init(struct
  {
  	if (!nor->params->set_4byte_addr_mode)
  		nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode_en4b_ex4b;

target/linux/generic/pending-6.12/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch

@@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
-@@ -463,7 +463,8 @@ static dev_t __init parse_root_device(ch
+@@ -465,7 +465,8 @@ static dev_t __init parse_root_device(ch
  	int error;
  	dev_t dev;
  

target/linux/generic/pending-6.12/655-increase_skb_pad.patch

@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -3062,7 +3062,7 @@ static inline int pskb_network_may_pull(
+@@ -3180,7 +3180,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD

target/linux/generic/pending-6.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

@@ -30,7 +30,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	struct fib_rules_ops    *fib6_rules_ops;
 --- a/include/uapi/linux/fib_rules.h
 +++ b/include/uapi/linux/fib_rules.h
-@@ -82,6 +82,10 @@ enum {
+@@ -83,6 +83,10 @@ enum {
  	FR_ACT_BLACKHOLE,	/* Drop without notification */
  	FR_ACT_UNREACHABLE,	/* Drop with ENETUNREACH */
  	FR_ACT_PROHIBIT,	/* Drop with EACCES */
@@ -76,7 +76,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
 --- a/net/ipv4/ipmr.c
 +++ b/net/ipv4/ipmr.c
-@@ -190,6 +190,7 @@ static int ipmr_rule_action(struct fib_r
+@@ -191,6 +191,7 @@ static int ipmr_rule_action(struct fib_r
  	case FR_ACT_UNREACHABLE:
  		return -ENETUNREACH;
  	case FR_ACT_PROHIBIT:
@@ -86,7 +86,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	default:
 --- a/net/ipv6/fib6_rules.c
 +++ b/net/ipv6/fib6_rules.c
-@@ -221,6 +221,10 @@ static int __fib6_rule_action(struct fib
+@@ -222,6 +222,10 @@ static int __fib6_rule_action(struct fib
  		err = -EACCES;
  		rt = net->ipv6.ip6_prohibit_entry;
  		goto discard_pkt;
@@ -119,7 +119,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  static void		ip6_link_failure(struct sk_buff *skb);
  static void		ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
  					   struct sk_buff *skb, u32 mtu,
-@@ -318,6 +320,18 @@ static const struct rt6_info ip6_prohibi
+@@ -316,6 +318,18 @@ static const struct rt6_info ip6_prohibi
  	.rt6i_flags	= (RTF_REJECT | RTF_NONEXTHOP),
  };
  
@@ -138,7 +138,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  static const struct rt6_info ip6_blk_hole_entry_template = {
  	.dst = {
  		.__rcuref	= RCUREF_INIT(1),
-@@ -1077,6 +1091,7 @@ static const int fib6_prop[RTN_MAX + 1]
+@@ -1085,6 +1099,7 @@ static const int fib6_prop[RTN_MAX + 1]
  	[RTN_BLACKHOLE]	= -EINVAL,
  	[RTN_UNREACHABLE] = -EHOSTUNREACH,
  	[RTN_PROHIBIT]	= -EACCES,
@@ -146,7 +146,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	[RTN_THROW]	= -EAGAIN,
  	[RTN_NAT]	= -EINVAL,
  	[RTN_XRESOLVE]	= -EINVAL,
-@@ -1112,6 +1127,10 @@ static void ip6_rt_init_dst_reject(struc
+@@ -1120,6 +1135,10 @@ static void ip6_rt_init_dst_reject(struc
  		rt->dst.output = ip6_pkt_prohibit_out;
  		rt->dst.input = ip6_pkt_prohibit;
  		break;
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	case RTN_THROW:
  	case RTN_UNREACHABLE:
  	default:
-@@ -4588,6 +4607,17 @@ static int ip6_pkt_prohibit_out(struct n
+@@ -4598,6 +4617,17 @@ static int ip6_pkt_prohibit_out(struct n
  	return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  
@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  /*
   *	Allocate a dst for local (unicast / anycast) address.
   */
-@@ -5079,7 +5109,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -5089,7 +5119,8 @@ static int rtm_to_fib6_config(struct sk_
  	if (rtm->rtm_type == RTN_UNREACHABLE ||
  	    rtm->rtm_type == RTN_BLACKHOLE ||
  	    rtm->rtm_type == RTN_PROHIBIT ||
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  		cfg->fc_flags |= RTF_REJECT;
  
  	if (rtm->rtm_type == RTN_LOCAL)
-@@ -6341,6 +6372,8 @@ static int ip6_route_dev_notify(struct n
+@@ -6349,6 +6380,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -6352,6 +6385,7 @@ static int ip6_route_dev_notify(struct n
+@@ -6360,6 +6393,7 @@ static int ip6_route_dev_notify(struct n
  		in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  		in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
  #endif
  	}
-@@ -6552,6 +6586,8 @@ static int __net_init ip6_route_net_init
+@@ -6555,6 +6589,8 @@ static int __net_init ip6_route_net_init
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  	net->ipv6.fib6_has_custom_rules = false;
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
  					       sizeof(*net->ipv6.ip6_prohibit_entry),
  					       GFP_KERNEL);
-@@ -6562,11 +6598,21 @@ static int __net_init ip6_route_net_init
+@@ -6565,11 +6601,21 @@ static int __net_init ip6_route_net_init
  			 ip6_template_metrics, true);
  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_uncached);
  
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
  			 ip6_template_metrics, true);
-@@ -6593,6 +6639,8 @@ out:
+@@ -6596,6 +6642,8 @@ out:
  	return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  out_ip6_prohibit_entry:
  	kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
-@@ -6612,6 +6660,7 @@ static void __net_exit ip6_route_net_exi
+@@ -6615,6 +6663,7 @@ static void __net_exit ip6_route_net_exi
  	kfree(net->ipv6.ip6_null_entry);
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  	kfree(net->ipv6.ip6_prohibit_entry);
@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	kfree(net->ipv6.ip6_blk_hole_entry);
  #endif
  	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
-@@ -6695,6 +6744,9 @@ void __init ip6_route_init_special_entri
+@@ -6698,6 +6747,9 @@ void __init ip6_route_init_special_entri
  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

target/linux/generic/pending-6.12/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch

@@ -17,7 +17,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
 
 --- a/include/uapi/linux/fib_rules.h
 +++ b/include/uapi/linux/fib_rules.h
-@@ -89,6 +89,8 @@ enum {
+@@ -90,6 +90,8 @@ enum {
  	__FR_ACT_MAX,
  };
  
@@ -28,7 +28,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  #endif
 --- a/include/uapi/linux/icmpv6.h
 +++ b/include/uapi/linux/icmpv6.h
-@@ -126,6 +126,8 @@ struct icmp6hdr {
+@@ -127,6 +127,8 @@ struct icmp6hdr {
  #define ICMPV6_POLICY_FAIL		5
  #define ICMPV6_REJECT_ROUTE		6
  

target/linux/generic/pending-6.12/690-net-add-missing-check-for-TCP-fraglist-GRO.patch

@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/ipv4/tcp_offload.c
 +++ b/net/ipv4/tcp_offload.c
-@@ -367,6 +367,7 @@ struct sk_buff *tcp_gro_receive(struct l
+@@ -354,6 +354,7 @@ struct sk_buff *tcp_gro_receive(struct l
  		flush |= (__force int)(flags ^ tcp_flag_word(th2));
  		flush |= skb->ip_summed != p->ip_summed;
  		flush |= skb->csum_level != p->csum_level;

target/linux/generic/pending-6.12/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch

@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -8469,7 +8469,7 @@ static int nft_register_flowtable_net_ho
+@@ -8658,7 +8658,7 @@ static int nft_register_flowtable_net_ho
  		err = flowtable->data.type->setup(&flowtable->data,
  						  hook->ops.dev,
  						  FLOW_BLOCK_BIND);

target/linux/generic/pending-6.12/703-phy-add-detach-callback-to-struct-phy_driver.patch

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1910,6 +1910,9 @@ void phy_detach(struct phy_device *phyde
+@@ -2013,6 +2013,9 @@ void phy_detach(struct phy_device *phyde
  	if (phydev->devlink)
  		device_link_del(phydev->devlink);
  
@@ -23,7 +23,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  			sysfs_remove_link(&dev->dev.kobj, "phydev");
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -980,6 +980,12 @@ struct phy_driver {
+@@ -999,6 +999,12 @@ struct phy_driver {
  	/** @handle_interrupt: Override default interrupt handling */
  	irqreturn_t (*handle_interrupt)(struct phy_device *phydev);
  

target/linux/generic/pending-6.12/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch

@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
 --- a/include/uapi/linux/if_link.h
 +++ b/include/uapi/linux/if_link.h
-@@ -571,6 +571,7 @@ enum {
+@@ -1094,6 +1094,7 @@ enum {
  	IFLA_BRPORT_MCAST_MAX_GROUPS,
  	IFLA_BRPORT_NEIGH_VLAN_SUPPRESS,
  	IFLA_BRPORT_BACKUP_NHID,
@@ -152,7 +152,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	    (!(p->flags & BR_PORT_LOCKED) || !(p->flags & BR_LEARNING))) {
 --- a/net/core/rtnetlink.c
 +++ b/net/core/rtnetlink.c
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
  #include "dev.h"
  
  #define RTNL_MAX_TYPE		50
@@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  struct rtnl_link {
  	rtnl_doit_func		doit;
-@@ -4981,7 +4981,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -5012,7 +5012,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
  	    brport_nla_put_flag(skb, flags, mask,
  				IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
  	    brport_nla_put_flag(skb, flags, mask,

target/linux/generic/pending-6.12/711-01-net-dsa-qca8k-implement-lag_fdb_add-del-ops.patch

@@ -16,7 +16,7 @@ Signed-off-by: Christian Marangi <[email protected]>
 
 --- a/drivers/net/dsa/qca/qca8k-8xxx.c
 +++ b/drivers/net/dsa/qca/qca8k-8xxx.c
-@@ -2012,6 +2012,8 @@ static const struct dsa_switch_ops qca8k
+@@ -2031,6 +2031,8 @@ static const struct dsa_switch_ops qca8k
  	.port_fdb_add		= qca8k_port_fdb_add,
  	.port_fdb_del		= qca8k_port_fdb_del,
  	.port_fdb_dump		= qca8k_port_fdb_dump,
@@ -27,7 +27,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  	.port_mirror_add	= qca8k_port_mirror_add,
 --- a/drivers/net/dsa/qca/qca8k-common.c
 +++ b/drivers/net/dsa/qca/qca8k-common.c
-@@ -1235,6 +1235,42 @@ int qca8k_port_lag_leave(struct dsa_swit
+@@ -1234,6 +1234,42 @@ int qca8k_port_lag_leave(struct dsa_swit
  	return qca8k_lag_refresh_portmap(ds, port, lag, true);
  }
  
@@ -72,7 +72,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  	u32 val;
 --- a/drivers/net/dsa/qca/qca8k.h
 +++ b/drivers/net/dsa/qca/qca8k.h
-@@ -591,5 +591,11 @@ int qca8k_port_lag_join(struct dsa_switc
+@@ -592,5 +592,11 @@ int qca8k_port_lag_join(struct dsa_switc
  			struct netlink_ext_ack *extack);
  int qca8k_port_lag_leave(struct dsa_switch *ds, int port,
  			 struct dsa_lag lag);

target/linux/generic/pending-6.12/711-02-net-dsa-qca8k-enable-flooding-to-both-CPU-port.patch

@@ -14,7 +14,7 @@ Signed-off-by: Christian Marangi <[email protected]>
 
 --- a/drivers/net/dsa/qca/qca8k-8xxx.c
 +++ b/drivers/net/dsa/qca/qca8k-8xxx.c
-@@ -1901,15 +1901,12 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -1913,15 +1913,12 @@ qca8k_setup(struct dsa_switch *ds)
  		}
  	}
  

target/linux/generic/pending-6.12/712-net-dsa-qca8k-enable-assisted-learning-on-CPU-port.patch

@@ -20,7 +20,7 @@ Signed-off-by: Christian Marangi <[email protected]>
 
 --- a/drivers/net/dsa/qca/qca8k-8xxx.c
 +++ b/drivers/net/dsa/qca/qca8k-8xxx.c
-@@ -2010,6 +2010,12 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -2022,6 +2022,12 @@ qca8k_setup(struct dsa_switch *ds)
  			dev_err(priv->dev, "failed enabling QCA header mode on port %d", dp->index);
  			return ret;
  		}
@@ -33,7 +33,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  	}
  
  	/* Forward all unknown frames to CPU port for Linux processing */
-@@ -2039,11 +2045,6 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -2051,11 +2057,6 @@ qca8k_setup(struct dsa_switch *ds)
  		if (ret)
  			return ret;
  
@@ -45,7 +45,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  		/* For port based vlans to work we need to set the
  		 * default egress vid
  		 */
-@@ -2095,6 +2096,9 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -2107,6 +2108,9 @@ qca8k_setup(struct dsa_switch *ds)
  	/* Set max number of LAGs supported */
  	ds->num_lag_ids = QCA8K_NUM_LAGS;
  

target/linux/generic/pending-6.12/730-net-ethernet-mtk_eth_soc-reset-all-TX-queues-on-DMA-.patch

@@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3145,11 +3145,19 @@ static int mtk_dma_init(struct mtk_eth *
+@@ -3150,11 +3150,19 @@ static int mtk_dma_init(struct mtk_eth *
  static void mtk_dma_free(struct mtk_eth *eth)
  {
  	const struct mtk_soc_data *soc = eth->soc;

target/linux/generic/pending-6.12/731-net-permit-ieee80211_ptr-even-with-no-CFG82111-suppo.patch

@@ -17,7 +17,7 @@ Signed-off-by: Christian Marangi <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -2243,7 +2243,7 @@ struct net_device {
+@@ -2224,7 +2224,7 @@ struct net_device {
  #if IS_ENABLED(CONFIG_AX25)
  	struct ax25_dev	__rcu	*ax25_ptr;
  #endif

target/linux/generic/pending-6.12/732-00-net-ethernet-mtk_eth_soc-compile-out-netsys-v2-code-.patch

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -1349,6 +1349,22 @@ struct mtk_mac {
+@@ -1336,6 +1336,22 @@ struct mtk_mac {
  /* the struct describing the SoC. these are declared in the soc_xyz.c files */
  extern const struct of_device_id of_mtk_match[];
  
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static inline bool mtk_is_netsys_v1(struct mtk_eth *eth)
  {
  	return eth->soc->version == 1;
-@@ -1363,6 +1379,7 @@ static inline bool mtk_is_netsys_v3_or_g
+@@ -1350,6 +1366,7 @@ static inline bool mtk_is_netsys_v3_or_g
  {
  	return eth->soc->version > 2;
  }

target/linux/generic/pending-6.12/732-01-net-ethernet-mtk_eth_soc-work-around-issue-with-send.patch

@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #include <net/page_pool/helpers.h>
  
  #include "mtk_eth_soc.h"
-@@ -1606,12 +1607,28 @@ static void mtk_wake_queue(struct mtk_et
+@@ -1611,12 +1612,28 @@ static void mtk_wake_queue(struct mtk_et
  	}
  }
  
@@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	bool gso = false;
  	int tx_num;
  
-@@ -1633,6 +1650,18 @@ static netdev_tx_t mtk_start_xmit(struct
+@@ -1638,6 +1655,18 @@ static netdev_tx_t mtk_start_xmit(struct
  		return NETDEV_TX_BUSY;
  	}
  
@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	/* TSO: fill MSS info in tcp checksum field */
  	if (skb_is_gso(skb)) {
  		if (skb_cow_head(skb, 0)) {
-@@ -1648,8 +1677,14 @@ static netdev_tx_t mtk_start_xmit(struct
+@@ -1653,8 +1682,14 @@ static netdev_tx_t mtk_start_xmit(struct
  		}
  	}
  

target/linux/generic/pending-6.12/733-01-net-ethernet-mtk_eth_soc-use-napi_build_skb.patch

@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2150,7 +2150,7 @@ static int mtk_poll_rx(struct napi_struc
+@@ -2155,7 +2155,7 @@ static int mtk_poll_rx(struct napi_struc
  			if (ret != XDP_PASS)
  				goto skip_rx;
  
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  			if (unlikely(!skb)) {
  				page_pool_put_full_page(ring->page_pool,
  							page, true);
-@@ -2188,7 +2188,7 @@ static int mtk_poll_rx(struct napi_struc
+@@ -2193,7 +2193,7 @@ static int mtk_poll_rx(struct napi_struc
  			dma_unmap_single(eth->dma_dev, ((u64)trxd.rxd1 | addr64),
  					 ring->buf_size, DMA_FROM_DEVICE);
  

target/linux/generic/pending-6.12/736-04-net-ethernet-mediatek-fix-ppe-flow-accounting-for-L2.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_ppe.c
 +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
-@@ -80,9 +80,9 @@ static int mtk_ppe_mib_wait_busy(struct
+@@ -83,9 +83,9 @@ static int mtk_ppe_mib_wait_busy(struct
  	int ret;
  	u32 val;
  
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  	if (ret)
  		dev_err(ppe->dev, "MIB table busy");
-@@ -90,17 +90,31 @@ static int mtk_ppe_mib_wait_busy(struct
+@@ -93,17 +93,31 @@ static int mtk_ppe_mib_wait_busy(struct
  	return ret;
  }
  
@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  	cnt_r0 = readl(ppe->base + MTK_PPE_MIB_SER_R0);
  	cnt_r1 = readl(ppe->base + MTK_PPE_MIB_SER_R1);
-@@ -109,19 +123,19 @@ static int mtk_mib_entry_read(struct mtk
+@@ -112,19 +126,19 @@ static int mtk_mib_entry_read(struct mtk
  	if (mtk_is_netsys_v3_or_greater(ppe->eth)) {
  		/* 64 bit for each counter */
  		u32 cnt_r3 = readl(ppe->base + MTK_PPE_MIB_SER_R3);
@@ -298,7 +298,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif
 --- a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
 +++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
-@@ -96,7 +96,7 @@ mtk_ppe_debugfs_foe_show(struct seq_file
+@@ -97,7 +97,7 @@ mtk_ppe_debugfs_foe_show(struct seq_file
  		if (bind && state != MTK_FOE_STATE_BIND)
  			continue;
  
@@ -309,7 +309,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		seq_printf(m, "%05x %s %7s", i,
 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
 +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
-@@ -516,24 +516,21 @@ static int
+@@ -520,24 +520,21 @@ static int
  mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f)
  {
  	struct mtk_flow_entry *entry;

target/linux/generic/pending-6.12/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch

@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -5450,7 +5450,7 @@ static const struct mtk_soc_data mt2701_
+@@ -5465,7 +5465,7 @@ static const struct mtk_soc_data mt2701_
  		.desc_size = sizeof(struct mtk_rx_dma),
  		.irq_done_mask = MTK_RX_DONE_INT,
  		.dma_l4_valid = RX_DMA_L4_VALID,
@@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,
  	},
-@@ -5478,7 +5478,7 @@ static const struct mtk_soc_data mt7621_
+@@ -5493,7 +5493,7 @@ static const struct mtk_soc_data mt7621_
  		.desc_size = sizeof(struct mtk_rx_dma),
  		.irq_done_mask = MTK_RX_DONE_INT,
  		.dma_l4_valid = RX_DMA_L4_VALID,
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,
  	},
-@@ -5508,7 +5508,7 @@ static const struct mtk_soc_data mt7622_
+@@ -5523,7 +5523,7 @@ static const struct mtk_soc_data mt7622_
  		.desc_size = sizeof(struct mtk_rx_dma),
  		.irq_done_mask = MTK_RX_DONE_INT,
  		.dma_l4_valid = RX_DMA_L4_VALID,
@@ -57,7 +57,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,
  	},
-@@ -5537,7 +5537,7 @@ static const struct mtk_soc_data mt7623_
+@@ -5552,7 +5552,7 @@ static const struct mtk_soc_data mt7623_
  		.desc_size = sizeof(struct mtk_rx_dma),
  		.irq_done_mask = MTK_RX_DONE_INT,
  		.dma_l4_valid = RX_DMA_L4_VALID,
@@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,
  	},
-@@ -5563,7 +5563,7 @@ static const struct mtk_soc_data mt7629_
+@@ -5578,7 +5578,7 @@ static const struct mtk_soc_data mt7629_
  		.desc_size = sizeof(struct mtk_rx_dma),
  		.irq_done_mask = MTK_RX_DONE_INT,
  		.dma_l4_valid = RX_DMA_L4_VALID,
@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,
  	},
-@@ -5595,7 +5595,7 @@ static const struct mtk_soc_data mt7981_
+@@ -5610,7 +5610,7 @@ static const struct mtk_soc_data mt7981_
  		.dma_l4_valid = RX_DMA_L4_VALID_V2,
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,
@@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	},
  };
  
-@@ -5625,7 +5625,7 @@ static const struct mtk_soc_data mt7986_
+@@ -5640,7 +5640,7 @@ static const struct mtk_soc_data mt7986_
  		.dma_l4_valid = RX_DMA_L4_VALID_V2,
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,
@@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	},
  };
  
-@@ -5678,7 +5678,7 @@ static const struct mtk_soc_data rt5350_
+@@ -5693,7 +5693,7 @@ static const struct mtk_soc_data rt5350_
  		.dma_l4_valid = RX_DMA_L4_VALID_PDMA,
  		.dma_max_len = MTK_TX_DMA_BUF_LEN,
  		.dma_len_offset = 16,

target/linux/generic/pending-6.12/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch

@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/Kconfig
 +++ b/drivers/net/ethernet/mediatek/Kconfig
-@@ -18,7 +18,6 @@ config NET_MEDIATEK_SOC
+@@ -26,7 +26,6 @@ config NET_MEDIATEK_SOC
  	select PHYLINK
  	select DIMLIB
  	select PAGE_POOL
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	help
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4562,6 +4562,7 @@ static int mtk_get_sset_count(struct net
+@@ -4571,6 +4571,7 @@ static int mtk_get_sset_count(struct net
  
  static void mtk_ethtool_pp_stats(struct mtk_eth *eth, u64 *data)
  {
@@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	struct page_pool_stats stats = {};
  	int i;
  
-@@ -4574,6 +4575,7 @@ static void mtk_ethtool_pp_stats(struct
+@@ -4583,6 +4584,7 @@ static void mtk_ethtool_pp_stats(struct
  		page_pool_get_stats(ring->page_pool, &stats);
  	}
  	page_pool_ethtool_stats_get(data, &stats);

target/linux/generic/pending-6.12/739-05-net-pcs-add-driver-for-MediaTek-USXGMII-PCS.patch

@@ -19,7 +19,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13356,7 +13356,9 @@ M:	Daniel Golle <[email protected]>
+@@ -14419,7 +14419,9 @@ M:	Daniel Golle <[email protected]>
  L:	[email protected]
  S:	Maintained
  F:	drivers/net/pcs/pcs-mtk-lynxi.c
@@ -51,7 +51,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  	depends on OF && (ARCH_RZN1 || COMPILE_TEST)
 --- a/drivers/net/pcs/Makefile
 +++ b/drivers/net/pcs/Makefile
-@@ -7,3 +7,4 @@ obj-$(CONFIG_PCS_XPCS)		+= pcs_xpcs.o
+@@ -8,3 +8,4 @@ obj-$(CONFIG_PCS_XPCS)		+= pcs_xpcs.o
  obj-$(CONFIG_PCS_LYNX)		+= pcs-lynx.o
  obj-$(CONFIG_PCS_MTK_LYNXI)	+= pcs-mtk-lynxi.o
  obj-$(CONFIG_PCS_RZN1_MIIC)	+= pcs-rzn1-miic.o

target/linux/generic/pending-6.12/741-net-phy-broadcom-update-dependency-condition.patch

@@ -24,7 +24,7 @@ Signed-off-by: David Bauer <[email protected]>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -113,7 +113,7 @@ config BROADCOM_PHY
+@@ -139,7 +139,7 @@ config BROADCOM_PHY
  	tristate "Broadcom 54XX PHYs"
  	select BCM_NET_PHYLIB
  	select BCM_NET_PHYPTP if NETWORK_PHY_TIMESTAMPING

target/linux/generic/pending-6.12/791-tg3-Fix-DMA-allocations-on-57766-devices.patch

@@ -17,7 +17,7 @@ Signed-off-by: Pavan Chebbi <[email protected]>
 
 --- a/drivers/net/ethernet/broadcom/tg3.c
 +++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -17732,8 +17732,10 @@ static int tg3_init_one(struct pci_dev *
+@@ -17802,8 +17802,10 @@ static int tg3_init_one(struct pci_dev *
  	} else
  		persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
  

target/linux/generic/pending-6.12/802-OPP-Provide-old-opp-to-config_clks-on-_set_opp.patch

@@ -33,7 +33,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  	return 0;
 --- a/drivers/opp/core.c
 +++ b/drivers/opp/core.c
-@@ -925,7 +925,8 @@ static int _set_opp_voltage(struct devic
+@@ -965,7 +965,8 @@ static int _set_opp_voltage(struct devic
  
  static int
  _opp_config_clk_single(struct device *dev, struct opp_table *opp_table,
@@ -43,7 +43,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  {
  	unsigned long *target = data;
  	unsigned long freq;
-@@ -957,8 +958,8 @@ _opp_config_clk_single(struct device *de
+@@ -997,8 +998,8 @@ _opp_config_clk_single(struct device *de
   * the order in which they are present in the array while scaling up.
   */
  int dev_pm_opp_config_clks_simple(struct device *dev,
@@ -54,7 +54,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  {
  	int ret, i;
  
-@@ -1240,7 +1241,7 @@ static int _set_opp(struct device *dev,
+@@ -1265,7 +1266,7 @@ static int _set_opp(struct device *dev,
  	}
  
  	if (opp_table->config_clks) {
@@ -63,7 +63,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  		if (ret)
  			return ret;
  	}
-@@ -1315,7 +1316,7 @@ int dev_pm_opp_set_rate(struct device *d
+@@ -1344,7 +1345,7 @@ int dev_pm_opp_set_rate(struct device *d
  		 * equivalent to a clk_set_rate()
  		 */
  		if (!_get_opp_count(opp_table)) {
@@ -74,7 +74,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  		}
 --- a/include/linux/pm_opp.h
 +++ b/include/linux/pm_opp.h
-@@ -61,7 +61,8 @@ typedef int (*config_regulators_t)(struc
+@@ -50,7 +50,8 @@ typedef int (*config_regulators_t)(struc
  			struct dev_pm_opp *old_opp, struct dev_pm_opp *new_opp,
  			struct regulator **regulators, unsigned int count);
  
@@ -84,7 +84,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  			struct dev_pm_opp *opp, void *data, bool scaling_down);
  
  /**
-@@ -172,8 +173,8 @@ int dev_pm_opp_set_config(struct device
+@@ -184,8 +185,8 @@ int dev_pm_opp_set_config(struct device
  int devm_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config);
  void dev_pm_opp_clear_config(int token);
  int dev_pm_opp_config_clks_simple(struct device *dev,
@@ -95,7 +95,7 @@ Signed-off-by: Christian Marangi <[email protected]>
  
  struct dev_pm_opp *dev_pm_opp_xlate_required_opp(struct opp_table *src_table, struct opp_table *dst_table, struct dev_pm_opp *src_opp);
  int dev_pm_opp_xlate_performance_state(struct opp_table *src_table, struct opp_table *dst_table, unsigned int pstate);
-@@ -377,8 +378,8 @@ static inline int devm_pm_opp_set_config
+@@ -395,8 +396,8 @@ static inline int devm_pm_opp_set_config
  static inline void dev_pm_opp_clear_config(int token) {}
  
  static inline int dev_pm_opp_config_clks_simple(struct device *dev,

target/linux/generic/pending-6.12/804-nvmem-core-support-mac-base-fixed-layout-cells.patch

@@ -33,7 +33,7 @@ string.
  #include <linux/init.h>
  #include <linux/kref.h>
  #include <linux/module.h>
-@@ -796,6 +799,62 @@ static int nvmem_validate_keepouts(struc
+@@ -797,6 +800,62 @@ static int nvmem_validate_keepouts(struc
  	return 0;
  }
  
@@ -96,7 +96,7 @@ string.
  static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
  {
  	struct device *dev = &nvmem->dev;
-@@ -835,6 +894,25 @@ static int nvmem_add_cells_from_dt(struc
+@@ -836,6 +895,25 @@ static int nvmem_add_cells_from_dt(struc
  		if (nvmem->fixup_dt_cell_info)
  			nvmem->fixup_dt_cell_info(nvmem, &info);
  

target/linux/generic/pending-6.12/810-pci_disable_common_quirks.patch

@@ -9,7 +9,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig
-@@ -113,6 +113,13 @@ config XEN_PCIDEV_FRONTEND
+@@ -118,6 +118,13 @@ config XEN_PCIDEV_FRONTEND
  	  The PCI device frontend driver allows the kernel to import arbitrary
  	  PCI devices from a PCI backend to support PCI driver domains.
  
@@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  /*
   * The Mellanox Tavor device gives false positive parity errors.  Disable
   * parity error reporting.
-@@ -3501,6 +3502,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -3508,6 +3509,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
  
@@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  /*
   * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
   * To work around this, query the size it should be configured to by the
-@@ -3526,6 +3529,8 @@ static void quirk_intel_ntb(struct pci_d
+@@ -3533,6 +3536,8 @@ static void quirk_intel_ntb(struct pci_d
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
  
@@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  /*
   * Some BIOS implementations leave the Intel GPU interrupts enabled, even
   * though no one is handling them (e.g., if the i915 driver is never
-@@ -3564,6 +3569,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -3571,6 +3576,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
  

target/linux/generic/pending-6.12/840-hwrng-bcm2835-set-quality-to-1000.patch

@@ -16,7 +16,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/drivers/char/hw_random/bcm2835-rng.c
 +++ b/drivers/char/hw_random/bcm2835-rng.c
-@@ -171,6 +171,7 @@ static int bcm2835_rng_probe(struct plat
+@@ -169,6 +169,7 @@ static int bcm2835_rng_probe(struct plat
  	priv->rng.init = bcm2835_rng_init;
  	priv->rng.read = bcm2835_rng_read;
  	priv->rng.cleanup = bcm2835_rng_cleanup;

target/linux/generic/pending-6.12/850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch

@@ -33,7 +33,7 @@ Signed-off-by: Marek Behún <[email protected]>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -277,7 +277,6 @@ struct advk_pcie {
+@@ -276,7 +276,6 @@ struct advk_pcie {
  	u8 wins_count;
  	struct irq_domain *rp_irq_domain;
  	struct irq_domain *irq_domain;
@@ -41,7 +41,7 @@ Signed-off-by: Marek Behún <[email protected]>
  	raw_spinlock_t irq_lock;
  	struct irq_domain *msi_domain;
  	struct irq_domain *msi_inner_domain;
-@@ -1426,14 +1425,19 @@ static void advk_pcie_irq_unmask(struct
+@@ -1418,14 +1417,19 @@ static void advk_pcie_irq_unmask(struct
  	raw_spin_unlock_irqrestore(&pcie->irq_lock, flags);
  }
  
@@ -63,7 +63,7 @@ Signed-off-by: Marek Behún <[email protected]>
  	irq_set_chip_data(virq, pcie);
  
  	return 0;
-@@ -1492,7 +1496,6 @@ static int advk_pcie_init_irq_domain(str
+@@ -1485,7 +1489,6 @@ static int advk_pcie_init_irq_domain(str
  	struct device *dev = &pcie->pdev->dev;
  	struct device_node *node = dev->of_node;
  	struct device_node *pcie_intc_node;
@@ -71,7 +71,7 @@ Signed-off-by: Marek Behún <[email protected]>
  	int ret = 0;
  
  	raw_spin_lock_init(&pcie->irq_lock);
-@@ -1503,28 +1506,14 @@ static int advk_pcie_init_irq_domain(str
+@@ -1496,28 +1499,14 @@ static int advk_pcie_init_irq_domain(str
  		return -ENODEV;
  	}
  

target/linux/generic/pending-6.12/900-net-ag71xx-fix-qca9530-and-qca9550-mdio-probe.patch

@@ -13,7 +13,7 @@ Signed-off-by: Oskari Lemmela <[email protected]>
 
 --- a/drivers/net/ethernet/atheros/ag71xx.c
 +++ b/drivers/net/ethernet/atheros/ag71xx.c
-@@ -638,7 +638,8 @@ static int ag71xx_mdio_get_divider(struc
+@@ -641,7 +641,8 @@ static int ag71xx_mdio_get_divider(struc
  	if (!ref_clock)
  		return -EINVAL;