kernel: bump 5.4 to 5.4.214 (#10170)

Manually rebased:
 generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
 ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
 layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch
 layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
 layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch
 octeon/patches-5.4/700-allocate_interface_by_label.patch

All other patches automatically rebased.

Signed-off-by: Liu Linhui <liulinhui36@gmail.com>

Signed-off-by: Liu Linhui <liulinhui36@gmail.com>

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .203
+LINUX_VERSION-5.4 = .214
-LINUX_KERNEL_HASH-5.4.203 = fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c29798a
+LINUX_KERNEL_HASH-5.4.214 = 9abc79b4808c827eb82f8a44313ce6d3ade255949989bb98c11acda7ca3bc5db

target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch

@@ -23,7 +23,7 @@ produce a noisy warning.
  		xhci->quirks |= XHCI_RESET_ON_RESUME;
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -425,10 +425,14 @@ static int xhci_try_enable_msi(struct us
+@@ -427,10 +427,14 @@ static int xhci_try_enable_msi(struct us
  		free_irq(hcd->irq, hcd);
  	hcd->irq = 0;
  

target/linux/ath25/patches-5.4/107-ar5312_gpio.patch

@@ -202,7 +202,7 @@
 +subsys_initcall(ar5312_gpio_init);
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -192,6 +192,7 @@ config ATH25
+@@ -190,6 +190,7 @@ config ATH25
  	select CEVT_R4K
  	select CSRC_R4K
  	select DMA_NONCOHERENT

target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch

@@ -9,7 +9,7 @@
  struct fis_image_desc {
      unsigned char name[16];      // Null terminated name
      uint32_t	  flash_base;    // Address within FLASH of image
-@@ -72,6 +74,7 @@ static int parse_redboot_partitions(stru
+@@ -73,6 +75,7 @@ static int parse_redboot_partitions(stru
  				    const struct mtd_partition **pparts,
  				    struct mtd_part_parser_data *data)
  {
@@ -17,7 +17,7 @@
  	int nrparts = 0;
  	struct fis_image_desc *buf;
  	struct mtd_partition *parts;
-@@ -239,14 +242,15 @@ static int parse_redboot_partitions(stru
+@@ -240,14 +243,15 @@ static int parse_redboot_partitions(stru
  		}
  	}
  #endif
@@ -35,7 +35,7 @@
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
  	if (nulllen > 0) {
  		strcpy(nullname, nullstring);
-@@ -265,6 +269,8 @@ static int parse_redboot_partitions(stru
+@@ -266,6 +270,8 @@ static int parse_redboot_partitions(stru
  	}
  #endif
  	for ( ; i<nrparts; i++) {
@@ -44,7 +44,7 @@
  		parts[i].size = fl->img->size;
  		parts[i].offset = fl->img->flash_base;
  		parts[i].name = names;
-@@ -298,6 +304,13 @@ static int parse_redboot_partitions(stru
+@@ -299,6 +305,13 @@ static int parse_redboot_partitions(stru
  		fl = fl->next;
  		kfree(tmp_fl);
  	}

target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch

@@ -1,6 +1,6 @@
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -93,12 +93,18 @@ static int parse_redboot_partitions(stru
+@@ -94,12 +94,18 @@ static int parse_redboot_partitions(stru
  
  	parse_redboot_of(master);
  
@@ -19,7 +19,7 @@
  				return -EIO;
  			}
  			offset -= master->erasesize;
-@@ -111,10 +117,6 @@ static int parse_redboot_partitions(stru
+@@ -112,10 +118,6 @@ static int parse_redboot_partitions(stru
  				goto nogood;
  		}
  	}
@@ -30,7 +30,7 @@
  
  	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
  	       master->name, offset);
-@@ -187,6 +189,11 @@ static int parse_redboot_partitions(stru
+@@ -188,6 +190,11 @@ static int parse_redboot_partitions(stru
  	}
  	if (i == numslots) {
  		/* Didn't find it */

target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch

@@ -1,6 +1,6 @@
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -70,6 +70,22 @@ static void parse_redboot_of(struct mtd_
+@@ -71,6 +71,22 @@ static void parse_redboot_of(struct mtd_
  	directory = dirblock;
  }
  
@@ -23,7 +23,7 @@
  static int parse_redboot_partitions(struct mtd_info *master,
  				    const struct mtd_partition **pparts,
  				    struct mtd_part_parser_data *data)
-@@ -86,6 +102,7 @@ static int parse_redboot_partitions(stru
+@@ -87,6 +103,7 @@ static int parse_redboot_partitions(stru
  	int namelen = 0;
  	int nulllen = 0;
  	int numslots;
@@ -31,7 +31,7 @@
  	unsigned long offset;
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
  	static char nullstring[] = "unallocated";
-@@ -200,7 +217,10 @@ static int parse_redboot_partitions(stru
+@@ -201,7 +218,10 @@ static int parse_redboot_partitions(stru
  		goto out;
  	}
  
@@ -43,7 +43,7 @@
  		struct fis_list *new_fl, **prev;
  
  		if (buf[i].name[0] == 0xff) {
-@@ -276,12 +296,13 @@ static int parse_redboot_partitions(stru
+@@ -277,12 +297,13 @@ static int parse_redboot_partitions(stru
  	}
  #endif
  	for ( ; i<nrparts; i++) {
@@ -59,7 +59,7 @@
  		strcpy(names, fl->img->name);
  #ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY
  		if (!memcmp(names, "RedBoot", 8) ||
-@@ -311,7 +332,9 @@ static int parse_redboot_partitions(stru
+@@ -312,7 +333,9 @@ static int parse_redboot_partitions(stru
  		fl = fl->next;
  		kfree(tmp_fl);
  	}

target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch

@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -220,6 +220,8 @@ config ATH79
+@@ -218,6 +218,8 @@ config ATH79
  	select SYS_SUPPORTS_BIG_ENDIAN
  	select SYS_SUPPORTS_MIPS16
  	select SYS_SUPPORTS_ZBOOT_UART_PROM

target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch

@@ -22,7 +22,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -915,3 +917,68 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -917,3 +919,68 @@ void of_gpiochip_remove(struct gpio_chip
  {
  	of_node_put(chip->of_node);
  }

target/linux/ath79/patches-5.4/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 @@ static int parse_redboot_partitions(stru
+@@ -109,10 +115,6 @@ static int parse_redboot_partitions(stru
  				goto nogood;
  		}
  	}
@@ -30,7 +30,7 @@
  
  	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
  	       master->name, offset);
-@@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru
+@@ -185,6 +187,11 @@ static int parse_redboot_partitions(stru
  	}
  	if (i == numslots) {
  		/* Didn't find it */

target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch

@@ -305,7 +305,7 @@
  	list_for_each_entry(p, head, list) {
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -460,48 +460,53 @@ static void tcp_options_write(__be32 *pt
+@@ -461,48 +461,53 @@ static void tcp_options_write(__be32 *pt
  	u16 options = opts->options;	/* mungable copy */
  
  	if (unlikely(OPTION_MD5 & options)) {
@@ -382,7 +382,7 @@
  	}
  
  	if (unlikely(opts->num_sack_blocks)) {
-@@ -509,16 +514,17 @@ static void tcp_options_write(__be32 *pt
+@@ -510,16 +515,17 @@ static void tcp_options_write(__be32 *pt
  			tp->duplicate_sack : tp->selective_acks;
  		int this_sack;
  
@@ -406,7 +406,7 @@
  		}
  
  		tp->rx_opt.dsack = 0;
-@@ -531,13 +537,14 @@ static void tcp_options_write(__be32 *pt
+@@ -532,13 +538,14 @@ static void tcp_options_write(__be32 *pt
  
  		if (foc->exp) {
  			len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
@@ -682,7 +682,7 @@
  struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
 --- a/net/netfilter/nf_conntrack_proto_tcp.c
 +++ b/net/netfilter/nf_conntrack_proto_tcp.c
-@@ -415,7 +415,7 @@ static void tcp_sack(const struct sk_buf
+@@ -423,7 +423,7 @@ static void tcp_sack(const struct sk_buf
  
  	/* Fast path for timestamp-only option */
  	if (length == TCPOLEN_TSTAMP_ALIGNED
@@ -706,7 +706,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3980,14 +3980,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3997,14 +3997,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
  
@@ -799,7 +799,7 @@
  		*sum = csum_fold(csum_partial(diff, sizeof(diff),
 --- a/include/linux/etherdevice.h
 +++ b/include/linux/etherdevice.h
-@@ -489,7 +489,7 @@ static inline bool is_etherdev_addr(cons
+@@ -488,7 +488,7 @@ static inline bool is_etherdev_addr(cons
   * @b: Pointer to Ethernet header
   *
   * Compare two Ethernet headers, returns 0 if equal.
@@ -808,7 +808,7 @@
   * aligned OR the platform can handle unaligned access.  This is the
   * case for all packets coming into netif_receive_skb or similar
   * entry points.
-@@ -512,11 +512,12 @@ static inline unsigned long compare_ethe
+@@ -511,11 +511,12 @@ static inline unsigned long compare_ethe
  	fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
  	return fold;
  #else

target/linux/bcm4908/patches-5.4/071-v5.12-0001-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch

@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
  	else
  		offset = CORE_STS_OVERRIDE_GMIIP2_PORT(port);
-@@ -985,6 +987,30 @@ struct bcm_sf2_of_data {
+@@ -990,6 +992,30 @@ struct bcm_sf2_of_data {
  	unsigned int num_cfp_rules;
  };
  
@@ -109,7 +109,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  /* Register offsets for the SWITCH_REG_* block */
  static const u16 bcm_sf2_7445_reg_offsets[] = {
  	[REG_SWITCH_CNTRL]	= 0x00,
-@@ -1033,6 +1059,9 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1038,6 +1064,9 @@ static const struct bcm_sf2_of_data bcm_
  };
  
  static const struct of_device_id bcm_sf2_of_match[] = {

target/linux/bcm4908/patches-5.4/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch

@@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void bcm_sf2_intr_disable(struct bcm_sf2_priv *priv)
  {
  	intrl2_0_mask_set(priv, 0xffffffff);
-@@ -734,6 +772,8 @@ static int bcm_sf2_sw_resume(struct dsa_
+@@ -739,6 +777,8 @@ static int bcm_sf2_sw_resume(struct dsa_
  		return ret;
  	}
  
@@ -91,7 +91,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	ret = bcm_sf2_cfp_resume(ds);
  	if (ret)
  		return ret;
-@@ -996,6 +1036,7 @@ struct bcm_sf2_of_data {
+@@ -1001,6 +1041,7 @@ struct bcm_sf2_of_data {
  	const u16 *reg_offsets;
  	unsigned int core_reg_align;
  	unsigned int num_cfp_rules;
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const u16 bcm_sf2_4908_reg_offsets[] = {
-@@ -1020,6 +1061,7 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1025,6 +1066,7 @@ static const struct bcm_sf2_of_data bcm_
  	.core_reg_align	= 0,
  	.reg_offsets	= bcm_sf2_4908_reg_offsets,
  	.num_cfp_rules	= 0, /* FIXME */
@@ -107,7 +107,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  /* Register offsets for the SWITCH_REG_* block */
-@@ -1130,6 +1172,7 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1135,6 +1177,7 @@ static int bcm_sf2_sw_probe(struct platf
  	priv->reg_offsets = data->reg_offsets;
  	priv->core_reg_align = data->core_reg_align;
  	priv->num_cfp_rules = data->num_cfp_rules;
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* Auto-detection using standard registers will not work, so
  	 * provide an indication of what kind of device we are for
-@@ -1184,6 +1227,8 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1189,6 +1232,8 @@ static int bcm_sf2_sw_probe(struct platf
  		return ret;
  	}
  

target/linux/bcm4908/patches-5.4/075-v5.13-0003-net-dsa-bcm_sf2-Fill-in-BCM4908-CFP-entries.patch

@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1060,7 +1060,7 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1065,7 +1065,7 @@ static const struct bcm_sf2_of_data bcm_
  	.type		= BCM4908_DEVICE_ID,
  	.core_reg_align	= 0,
  	.reg_offsets	= bcm_sf2_4908_reg_offsets,

target/linux/bcm4908/patches-5.4/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch

@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  force_link:
  	/* Force link settings detected from the PHY */
-@@ -661,6 +689,7 @@ static void bcm_sf2_sw_mac_link_set(stru
+@@ -666,6 +694,7 @@ static void bcm_sf2_sw_mac_link_set(stru
  				    phy_interface_t interface, bool link)
  {
  	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	u32 reg;
  
  	if (!phy_interface_mode_is_rgmii(interface) &&
-@@ -668,13 +697,15 @@ static void bcm_sf2_sw_mac_link_set(stru
+@@ -673,13 +702,15 @@ static void bcm_sf2_sw_mac_link_set(stru
  	    interface != PHY_INTERFACE_MODE_REVMII)
  		return;
  

target/linux/bcm4908/patches-5.4/075-v5.13-0005-net-dsa-bcm_sf2-fix-BCM4908-RGMII-reg-s.patch

@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		break;
  	default:
  		switch (port) {
-@@ -1079,9 +1084,7 @@ static const u16 bcm_sf2_4908_reg_offset
+@@ -1084,9 +1089,7 @@ static const u16 bcm_sf2_4908_reg_offset
  	[REG_PHY_REVISION]	= 0x14,
  	[REG_SPHY_CNTRL]	= 0x24,
  	[REG_CROSSBAR]		= 0xc8,

target/linux/bcm4908/patches-5.4/700-net-dsa-bcm_sf2-enable-GPHY-for-switch-probing.patch

@@ -29,7 +29,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1321,10 +1321,14 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1326,10 +1326,14 @@ static int bcm_sf2_sw_probe(struct platf
  	rev = reg_readl(priv, REG_PHY_REVISION);
  	priv->hw_params.gphy_rev = rev & PHY_REVISION_MASK;
  

target/linux/bcm4908/patches-5.4/701-net-dsa-bcm_sf2-keep-GPHY-enabled-on-the-BCM4908.patch

@@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1335,6 +1335,12 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1340,6 +1340,12 @@ static int bcm_sf2_sw_probe(struct platf
  		 priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff,
  		 priv->irq0, priv->irq1);
  

target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch

@@ -40,7 +40,7 @@ it on BCM4708 family.
  /* called during probe() after chip reset completes */
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -156,6 +156,49 @@ int xhci_start(struct xhci_hcd *xhci)
+@@ -158,6 +158,49 @@ int xhci_start(struct xhci_hcd *xhci)
  	return ret;
  }
  
@@ -90,7 +90,7 @@ it on BCM4708 family.
  /*
   * Reset a halted HC.
   *
-@@ -606,10 +649,20 @@ static int xhci_init(struct usb_hcd *hcd
+@@ -608,10 +651,20 @@ static int xhci_init(struct usb_hcd *hcd
  
  static int xhci_run_finished(struct xhci_hcd *xhci)
  {
@@ -114,7 +114,7 @@ it on BCM4708 family.
  	xhci->shared_hcd->state = HC_STATE_RUNNING;
  	xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
  
-@@ -619,6 +672,10 @@ static int xhci_run_finished(struct xhci
+@@ -621,6 +674,10 @@ static int xhci_run_finished(struct xhci
  	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
  			"Finished xhci_run for USB3 roothub");
  	return 0;

target/linux/bcm53xx/patches-5.4/906-BCM5301x-uart1.patch

@@ -1,6 +1,5 @@
-diff -Nuar a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
---- a/arch/arm/boot/dts/bcm5301x.dtsi	2021-12-29 16:55:29.441523015 +0800
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/bcm5301x.dtsi	2021-12-29 17:03:44.640694605 +0800
 @@ -38,8 +38,6 @@
  			reg = <0x0400 0x100>;
  			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

target/linux/bcm63xx/patches-5.4/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch

@@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  			ret = gpiod_hog(desc, name, lflags, dflags);
  			if (ret < 0) {
  				of_node_put(np);
-@@ -904,9 +911,11 @@ int of_gpiochip_add(struct gpio_chip *ch
+@@ -906,9 +913,11 @@ int of_gpiochip_add(struct gpio_chip *ch
  
  	of_node_get(chip->of_node);
  

target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch

@@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  	.width			= 2,
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -84,6 +84,7 @@ static int parse_redboot_partitions(stru
+@@ -85,6 +85,7 @@ static int parse_redboot_partitions(stru
  	int nulllen = 0;
  	int numslots;
  	unsigned long offset;
@@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
  	static char nullstring[] = "unallocated";
  #endif
-@@ -190,6 +191,16 @@ static int parse_redboot_partitions(stru
+@@ -191,6 +192,16 @@ static int parse_redboot_partitions(stru
  		goto out;
  	}
  
@@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  	for (i = 0; i < numslots; i++) {
  		struct fis_list *new_fl, **prev;
  
-@@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru
+@@ -211,10 +222,10 @@ static int parse_redboot_partitions(stru
  			goto out;
  		}
  		new_fl->img = &buf[i];

target/linux/generic/backport-5.4/080-wireguard-0005-crypto-arm64-chacha-depend-on-generic-chacha-library.patch

@@ -26,7 +26,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 
 --- a/arch/arm64/crypto/Kconfig
 +++ b/arch/arm64/crypto/Kconfig
-@@ -103,7 +103,7 @@ config CRYPTO_CHACHA20_NEON
+@@ -104,7 +104,7 @@ config CRYPTO_CHACHA20_NEON
  	tristate "ChaCha20, XChaCha20, and XChaCha12 stream ciphers using NEON instructions"
  	depends on KERNEL_MODE_NEON
  	select CRYPTO_BLKCIPHER

target/linux/generic/backport-5.4/080-wireguard-0006-crypto-arm64-chacha-expose-arm64-ChaCha-routine-as-l.patch

@@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 
 --- a/arch/arm64/crypto/Kconfig
 +++ b/arch/arm64/crypto/Kconfig
-@@ -104,6 +104,7 @@ config CRYPTO_CHACHA20_NEON
+@@ -105,6 +105,7 @@ config CRYPTO_CHACHA20_NEON
  	depends on KERNEL_MODE_NEON
  	select CRYPTO_BLKCIPHER
  	select CRYPTO_LIB_CHACHA_GENERIC

target/linux/generic/backport-5.4/080-wireguard-0018-crypto-arm64-poly1305-incorporate-OpenSSL-CRYPTOGAMS.patch

@@ -34,7 +34,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 
 --- a/arch/arm64/crypto/Kconfig
 +++ b/arch/arm64/crypto/Kconfig
-@@ -106,6 +106,12 @@ config CRYPTO_CHACHA20_NEON
+@@ -107,6 +107,12 @@ config CRYPTO_CHACHA20_NEON
  	select CRYPTO_LIB_CHACHA_GENERIC
  	select CRYPTO_ARCH_HAVE_LIB_CHACHA
  

target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch

@@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -5435,8 +5435,7 @@ static inline void skb_gro_reset_offset(
+@@ -5436,8 +5436,7 @@ static inline void skb_gro_reset_offset(
  	NAPI_GRO_CB(skb)->frag0 = NULL;
  	NAPI_GRO_CB(skb)->frag0_len = 0;
  

target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch

@@ -22,11 +22,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  net/dsa/switch.c | 31 ++++++++++++++++++++++---------
  1 file changed, 22 insertions(+), 9 deletions(-)
 
-diff --git a/net/dsa/switch.c b/net/dsa/switch.c
-index 6a9607518823..dd71e3301b27 100644
 --- a/net/dsa/switch.c
 +++ b/net/dsa/switch.c
-@@ -65,19 +65,12 @@ static int dsa_switch_bridge_join(struct dsa_switch *ds,
+@@ -65,19 +65,12 @@ static int dsa_switch_bridge_join(struct
  	return 0;
  }
  
@@ -48,7 +46,7 @@ index 6a9607518823..dd71e3301b27 100644
  	/* If the bridge was vlan_filtering, the bridge core doesn't trigger an
  	 * event for changing vlan_filtering setting upon slave ports leaving
  	 * it. That is a good thing, because that lets us handle it and also
-@@ -103,6 +96,26 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
+@@ -103,6 +96,26 @@ static int dsa_switch_bridge_leave(struc
  		if (err && err != EOPNOTSUPP)
  			return err;
  	}
@@ -75,6 +73,3 @@ index 6a9607518823..dd71e3301b27 100644
  	return 0;
  }
  
--- 
-2.34.1
-

target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch

@@ -39,11 +39,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  net/dsa/switch.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
-diff --git a/net/dsa/switch.c b/net/dsa/switch.c
-index dd71e3301b27..f517d6d7efa2 100644
 --- a/net/dsa/switch.c
 +++ b/net/dsa/switch.c
-@@ -112,9 +112,11 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
+@@ -112,9 +112,11 @@ static int dsa_switch_bridge_leave(struc
  		ds->ops->crosschip_bridge_leave(ds, info->sw_index, info->port,
  						info->br);
  
@@ -58,6 +56,3 @@ index dd71e3301b27..f517d6d7efa2 100644
  
  	return 0;
  }
--- 
-2.34.1
-

target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

@@ -1126,7 +1126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
-@@ -438,7 +438,7 @@ static int dwc_eth_dwmac_probe(struct pl
+@@ -439,7 +439,7 @@ static int dwc_eth_dwmac_probe(struct pl
  	if (IS_ERR(stmmac_res.addr))
  		return PTR_ERR(stmmac_res.addr);
  

target/linux/generic/hack-5.4/250-netfilter_depends.patch

@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -228,7 +228,6 @@ config NF_CONNTRACK_FTP
+@@ -227,7 +227,6 @@ config NF_CONNTRACK_FTP
  
  config NF_CONNTRACK_H323
  	tristate "H.323 protocol support"
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	depends on NETFILTER_ADVANCED
  	help
  	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -1088,7 +1087,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -1087,7 +1086,6 @@ config NETFILTER_XT_TARGET_SECMARK
  
  config NETFILTER_XT_TARGET_TCPMSS
  	tristate '"TCPMSS" target support'

target/linux/generic/hack-5.4/321-powerpc_crtsavres_prereq.patch

@@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -61,20 +61,6 @@ machine-$(CONFIG_PPC64) += 64
+@@ -44,20 +44,6 @@ machine-$(CONFIG_PPC64) += 64
  machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
  UTS_MACHINE := $(subst $(space),,$(machine-y))
  

target/linux/generic/hack-5.4/550-loop-Report-EOPNOTSUPP-properly.patch

@@ -27,7 +27,7 @@ Reviewed-by: Bart Van Assche <bvanassche@acm.org>
  		goto end_io;
  	}
  
-@@ -1973,7 +1973,10 @@ static void loop_handle_cmd(struct loop_
+@@ -1978,7 +1978,10 @@ static void loop_handle_cmd(struct loop_
   failed:
  	/* complete non-aio request */
  	if (!cmd->use_aio || ret) {

target/linux/generic/hack-5.4/601-netfilter-export-udp_get_timeouts-function.patch

@@ -8,23 +8,18 @@ Subject: [PATCH] net: patch linux kernel to support shortcut-fe-cm
  nf_conntrack_timeout.h | 2 +
  1 file changed, 2 insertion(+)
 
-diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
-index 6dd7239..e1f6d69 100644
 --- a/include/net/netfilter/nf_conntrack_timeout.h
 +++ b/include/net/netfilter/nf_conntrack_timeout.h
-@@ -123,5 +123,7 @@ static inline void nf_ct_destroy_timeout(struct nf_conn *ct)
+@@ -124,4 +124,6 @@ extern struct nf_ct_timeout *(*nf_ct_tim
- extern struct nf_ct_timeout *(*nf_ct_timeout_find_get_hook)(struct net *net, const char *name);
  extern void (*nf_ct_timeout_put_hook)(struct nf_ct_timeout *timeout);
  #endif
-+
-+extern unsigned int *udp_get_timeouts(struct net *net);
  
++extern unsigned int *udp_get_timeouts(struct net *net);
++
  #endif /* _NF_CONNTRACK_TIMEOUT_H */
-diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
-index 7365b43..2238d55 100644
 --- a/net/netfilter/nf_conntrack_proto_udp.c
 +++ b/net/netfilter/nf_conntrack_proto_udp.c
-@@ -29,10 +29,11 @@ static const unsigned int udp_timeouts[UDP_CT_MAX] = {
+@@ -29,10 +29,11 @@ static const unsigned int udp_timeouts[U
  	[UDP_CT_REPLIED]	= 120*HZ,
  };
  
@@ -37,6 +32,3 @@ index 7365b43..2238d55 100644
  
  static void udp_error_log(const struct sk_buff *skb,
  			  const struct nf_hook_state *state,
--- 
-2.17.1
-

target/linux/generic/hack-5.4/650-netfilter-add-xt_OFFLOAD-target.patch

@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	depends on !NF_CONNTRACK || NF_CONNTRACK
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -690,8 +690,6 @@ config NFT_FIB_NETDEV
+@@ -689,8 +689,6 @@ config NFT_FIB_NETDEV
  
  endif # NF_TABLES_NETDEV
  
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config NF_FLOW_TABLE_INET
  	tristate "Netfilter flow table mixed IPv4/IPv6 module"
  	depends on NF_FLOW_TABLE
-@@ -700,11 +698,12 @@ config NF_FLOW_TABLE_INET
+@@ -699,11 +697,12 @@ config NF_FLOW_TABLE_INET
  
  	  To compile it as a module, choose M here.
  
@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	help
  	  This option adds the flow table core infrastructure.
  
-@@ -993,6 +992,15 @@ config NETFILTER_XT_TARGET_NOTRACK
+@@ -992,6 +991,15 @@ config NETFILTER_XT_TARGET_NOTRACK
  	depends on NETFILTER_ADVANCED
  	select NETFILTER_XT_TARGET_CT
  

target/linux/generic/hack-5.4/721-phy_packets.patch

@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
   */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2684,6 +2684,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2692,6 +2692,10 @@ static inline int pskb_trim(struct sk_bu
  	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  /**
   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *	@skb: buffer to alter
-@@ -2815,16 +2819,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2823,16 +2827,6 @@ static inline struct sk_buff *dev_alloc_
  }
  
  

target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch

@@ -98,7 +98,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  #if defined(CONFIG_NF_CONNTRACK_LABELS)
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -136,6 +136,14 @@ config NF_CONNTRACK_EVENTS
+@@ -135,6 +135,14 @@ config NF_CONNTRACK_EVENTS
  
  	  If unsure, say `N'.
  

target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

@@ -99,7 +99,7 @@
  #ifdef CONFIG_ETHERNET_PACKET_MANGLE
  	if (!dev->eth_mangle_tx ||
  	    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
-@@ -4714,6 +4722,11 @@ void netdev_rx_handler_unregister(struct
+@@ -4715,6 +4723,11 @@ void netdev_rx_handler_unregister(struct
  }
  EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
  
@@ -111,7 +111,7 @@
  /*
   * Limit the use of PFMEMALLOC reserves to those protocols that implement
   * the special handling of PFMEMALLOC skbs.
-@@ -4764,6 +4777,10 @@ static int __netif_receive_skb_core(stru
+@@ -4765,6 +4778,10 @@ static int __netif_receive_skb_core(stru
  	int ret = NET_RX_DROP;
  	__be16 type;
  
@@ -119,10 +119,10 @@
 +	int (*fast_recv)(struct sk_buff *skb);
 +#endif
 +
- 	net_timestamp_check(!netdev_tstamp_prequeue, skb);
+ 	net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
  
  	trace_netif_receive_skb(skb);
-@@ -4803,6 +4820,16 @@ another_round:
+@@ -4804,6 +4821,16 @@ another_round:
  			goto out;
  	}
  

target/linux/generic/hack-5.4/996-fs-ntfs3-Add-NTFS3-in-fs-Kconfig-and-fs-Makefile.patch

@@ -11,23 +11,19 @@ Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
  fs/Makefile | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/fs/Kconfig b/fs/Kconfig
-index da524c4d7b7e..0bbad356ab57 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -145,6 +145,7 @@ menu "DOS/FAT/EXFAT/NT Filesystems"
+@@ -143,6 +143,7 @@ menu "DOS/FAT/NT Filesystems"
+ 
  source "fs/fat/Kconfig"
- source "fs/exfat/Kconfig"
  source "fs/ntfs/Kconfig"
 +source "fs/ntfs3/Kconfig"
  
  endmenu
  endif # BLOCK
-diff --git a/fs/Makefile b/fs/Makefile
-index 999d1a23f036..4f5242cdaee2 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -100,6 +100,7 @@ obj-$(CONFIG_SYSV_FS)		+= sysv/
+@@ -98,6 +98,7 @@ obj-$(CONFIG_SYSV_FS)		+= sysv/
  obj-$(CONFIG_CIFS)		+= cifs/
  obj-$(CONFIG_HPFS_FS)		+= hpfs/
  obj-$(CONFIG_NTFS_FS)		+= ntfs/
@@ -35,6 +31,3 @@ index 999d1a23f036..4f5242cdaee2 100644
  obj-$(CONFIG_UFS_FS)		+= ufs/
  obj-$(CONFIG_EFS_FS)		+= efs/
  obj-$(CONFIG_JFFS2_FS)		+= jffs2/
--- 
-2.30.1
-

target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch

@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -305,6 +305,7 @@ static int parse_redboot_partitions(stru
+@@ -306,6 +306,7 @@ static int parse_redboot_partitions(stru
  
  static const struct of_device_id mtd_parser_redboot_of_match_table[] = {
  	{ .compatible = "redboot-fis" },

target/linux/generic/pending-5.4/420-mtd-redboot_space.patch

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -279,14 +279,21 @@ static int parse_redboot_partitions(stru
+@@ -280,14 +280,21 @@ static int parse_redboot_partitions(stru
  #endif
  		names += strlen(names)+1;
  

target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch

@@ -128,7 +128,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  #define NFTA_FLOWTABLE_MAX	(__NFTA_FLOWTABLE_MAX - 1)
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -711,6 +711,15 @@ config NF_FLOW_TABLE
+@@ -710,6 +710,15 @@ config NF_FLOW_TABLE
  
  	  To compile it as a module, choose M here.
  
@@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 +MODULE_ALIAS("nf-flow-table-hw");
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -5752,6 +5752,13 @@ static int nf_tables_flowtable_parse_hoo
+@@ -5758,6 +5758,13 @@ static int nf_tables_flowtable_parse_hoo
  	if (err < 0)
  		return err;
  
@@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  	ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
  	if (!ops)
  		return -ENOMEM;
-@@ -5882,10 +5889,19 @@ static int nf_tables_newflowtable(struct
+@@ -5888,10 +5895,19 @@ static int nf_tables_newflowtable(struct
  	}
  
  	flowtable->data.type = type;
@@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  	err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
  					     flowtable);
  	if (err < 0)
-@@ -6011,7 +6027,8 @@ static int nf_tables_fill_flowtable_info
+@@ -6017,7 +6033,8 @@ static int nf_tables_fill_flowtable_info
  	    nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
  	    nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
  	    nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),

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

@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2650,7 +2650,7 @@ static inline int pskb_network_may_pull(
+@@ -2658,7 +2658,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-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /*
   *	Allocate a dst for local (unicast / anycast) address.
   */
-@@ -4933,7 +4963,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -4940,7 +4970,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 <jogo@openwrt.org>
  		cfg->fc_flags |= RTF_REJECT;
  
  	if (rtm->rtm_type == RTN_LOCAL)
-@@ -6084,6 +6115,8 @@ static int ip6_route_dev_notify(struct n
+@@ -6091,6 +6122,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 <jogo@openwrt.org>
  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -6095,6 +6128,7 @@ static int ip6_route_dev_notify(struct n
+@@ -6102,6 +6135,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 <jogo@openwrt.org>
  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
  #endif
  	}
-@@ -6287,6 +6321,8 @@ static int __net_init ip6_route_net_init
+@@ -6294,6 +6328,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 <jogo@openwrt.org>
  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
  					       sizeof(*net->ipv6.ip6_prohibit_entry),
  					       GFP_KERNEL);
-@@ -6297,11 +6333,21 @@ static int __net_init ip6_route_net_init
+@@ -6304,11 +6340,21 @@ static int __net_init ip6_route_net_init
  			 ip6_template_metrics, true);
  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
  
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  	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);
-@@ -6325,6 +6371,8 @@ out:
+@@ -6332,6 +6378,8 @@ out:
  	return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  out_ip6_prohibit_entry:
  	kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
-@@ -6344,6 +6392,7 @@ static void __net_exit ip6_route_net_exi
+@@ -6351,6 +6399,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 <jogo@openwrt.org>
  	kfree(net->ipv6.ip6_blk_hole_entry);
  #endif
  	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
-@@ -6421,6 +6470,9 @@ void __init ip6_route_init_special_entri
+@@ -6428,6 +6477,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-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	__u16			tc_index;	/* traffic control index */
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -5501,6 +5501,9 @@ static enum gro_result dev_gro_receive(s
+@@ -5502,6 +5502,9 @@ static enum gro_result dev_gro_receive(s
  	int same_flow;
  	int grow;
  
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (netif_elide_gro(skb->dev))
  		goto normal;
  
-@@ -7303,6 +7306,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -7304,6 +7307,48 @@ static void __netdev_adjacent_dev_unlink
  					   &upper_dev->adj_list.lower);
  }
  
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static int __netdev_upper_dev_link(struct net_device *dev,
  				   struct net_device *upper_dev, bool master,
  				   void *upper_priv, void *upper_info,
-@@ -7353,6 +7398,7 @@ static int __netdev_upper_dev_link(struc
+@@ -7354,6 +7399,7 @@ static int __netdev_upper_dev_link(struc
  	if (ret)
  		return ret;
  
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
  					    &changeupper_info.info);
  	ret = notifier_to_errno(ret);
-@@ -7446,6 +7492,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -7447,6 +7493,7 @@ void netdev_upper_dev_unlink(struct net_
  
  	__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
  
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
  				      &changeupper_info.info);
  
-@@ -8176,6 +8223,7 @@ int dev_set_mac_address(struct net_devic
+@@ -8177,6 +8224,7 @@ int dev_set_mac_address(struct net_devic
  	if (err)
  		return err;
  	dev->addr_assign_type = NET_ADDR_SET;

target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch

@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  static int netif_rx_internal(struct sk_buff *skb);
  static int call_netdevice_notifiers_info(unsigned long val,
-@@ -5943,6 +5944,11 @@ void __napi_schedule(struct napi_struct
+@@ -5944,6 +5945,11 @@ void __napi_schedule(struct napi_struct
  {
  	unsigned long flags;
  
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	local_irq_save(flags);
  	____napi_schedule(this_cpu_ptr(&softnet_data), n);
  	local_irq_restore(flags);
-@@ -5994,6 +6000,10 @@ EXPORT_SYMBOL(napi_schedule_prep);
+@@ -5995,6 +6001,10 @@ EXPORT_SYMBOL(napi_schedule_prep);
   */
  void __napi_schedule_irqoff(struct napi_struct *n)
  {
@@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (!IS_ENABLED(CONFIG_PREEMPT_RT))
  		____napi_schedule(this_cpu_ptr(&softnet_data), n);
  	else
-@@ -6258,9 +6268,89 @@ static void init_gro_hash(struct napi_st
+@@ -6259,9 +6269,89 @@ static void init_gro_hash(struct napi_st
  	napi->gro_bitmask = 0;
  }
  
@@ -208,7 +208,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	INIT_LIST_HEAD(&napi->poll_list);
  	hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
  	napi->timer.function = napi_watchdog;
-@@ -6277,6 +6367,7 @@ void netif_napi_add(struct net_device *d
+@@ -6278,6 +6368,7 @@ void netif_napi_add(struct net_device *d
  #ifdef CONFIG_NETPOLL
  	napi->poll_owner = -1;
  #endif
@@ -216,7 +216,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	set_bit(NAPI_STATE_SCHED, &napi->state);
  	set_bit(NAPI_STATE_NPSVC, &napi->state);
  	list_add_rcu(&napi->dev_list, &dev->napi_list);
-@@ -6317,6 +6408,7 @@ static void flush_gro_hash(struct napi_s
+@@ -6318,6 +6409,7 @@ static void flush_gro_hash(struct napi_s
  void netif_napi_del(struct napi_struct *napi)
  {
  	might_sleep();
@@ -224,7 +224,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (napi_hash_del(napi))
  		synchronize_net();
  	list_del_init(&napi->dev_list);
-@@ -6329,50 +6421,18 @@ EXPORT_SYMBOL(netif_napi_del);
+@@ -6330,50 +6422,18 @@ EXPORT_SYMBOL(netif_napi_del);
  
  static int napi_poll(struct napi_struct *n, struct list_head *repoll)
  {
@@ -279,7 +279,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	/* Some drivers may have called napi_schedule
  	 * prior to exhausting their budget.
-@@ -10352,6 +10412,10 @@ static int __init net_dev_init(void)
+@@ -10353,6 +10413,10 @@ static int __init net_dev_init(void)
  		sd->backlog.weight = weight_p;
  	}
  

target/linux/generic/pending-5.4/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch

@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2154,8 +2154,8 @@ static irqreturn_t mtk_handle_irq_rx(int
+@@ -2171,8 +2171,8 @@ static irqreturn_t mtk_handle_irq_rx(int
  	struct mtk_eth *eth = _eth;
  
  	if (likely(napi_schedule_prep(&eth->rx_napi))) {
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	}
  
  	return IRQ_HANDLED;
-@@ -2166,8 +2166,8 @@ static irqreturn_t mtk_handle_irq_tx(int
+@@ -2183,8 +2183,8 @@ static irqreturn_t mtk_handle_irq_tx(int
  	struct mtk_eth *eth = _eth;
  
  	if (likely(napi_schedule_prep(&eth->tx_napi))) {
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	}
  
  	return IRQ_HANDLED;
-@@ -3090,6 +3090,8 @@ static int mtk_probe(struct platform_dev
+@@ -3107,6 +3107,8 @@ static int mtk_probe(struct platform_dev
  	 * for NAPI to work
  	 */
  	init_dummy_netdev(&eth->dummy_dev);

target/linux/generic/pending-5.4/770-06-net-ethernet-mtk_eth_soc-implement-dynamic-interrupt.patch

@@ -194,7 +194,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	mtk_tx_irq_disable(eth, ~0);
  	mtk_rx_irq_disable(eth, ~0);
  
-@@ -2971,6 +3045,13 @@ static int mtk_probe(struct platform_dev
+@@ -2968,6 +3042,13 @@ static int mtk_probe(struct platform_dev
  	spin_lock_init(&eth->page_lock);
  	spin_lock_init(&eth->tx_irq_lock);
  	spin_lock_init(&eth->rx_irq_lock);

target/linux/generic/pending-5.4/770-15-net-ethernet-mediatek-mtk_eth_soc-add-support-for-in.patch

@@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	return 0;
  }
  
-@@ -3185,6 +3193,13 @@ static int mtk_probe(struct platform_dev
+@@ -3182,6 +3190,13 @@ static int mtk_probe(struct platform_dev
  			goto err_free_dev;
  	}
  
@@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	for (i = 0; i < MTK_MAX_DEVS; i++) {
  		if (!eth->netdev[i])
  			continue;
-@@ -3259,6 +3274,7 @@ static const struct mtk_soc_data mt7621_
+@@ -3258,6 +3273,7 @@ static const struct mtk_soc_data mt7621_
  	.hw_features = MTK_HW_FEATURES,
  	.required_clks = MT7621_CLKS_BITMAP,
  	.required_pctl = false,
@@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  
  static const struct mtk_soc_data mt7622_data = {
-@@ -3267,6 +3283,7 @@ static const struct mtk_soc_data mt7622_
+@@ -3266,6 +3282,7 @@ static const struct mtk_soc_data mt7622_
  	.hw_features = MTK_HW_FEATURES,
  	.required_clks = MT7622_CLKS_BITMAP,
  	.required_pctl = false,

target/linux/generic/pending-5.4/770-16-net-ethernet-mediatek-mtk_eth_soc-add-flow-offloadin.patch

@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  skip_rx:
  		ring->data[idx] = new_data;
-@@ -2902,6 +2908,25 @@ static int mtk_set_rxnfc(struct net_devi
+@@ -2899,6 +2905,25 @@ static int mtk_set_rxnfc(struct net_devi
  	return ret;
  }
  
@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static const struct ethtool_ops mtk_ethtool_ops = {
  	.get_link_ksettings	= mtk_get_link_ksettings,
  	.set_link_ksettings	= mtk_set_link_ksettings,
-@@ -2933,6 +2958,7 @@ static const struct net_device_ops mtk_n
+@@ -2930,6 +2955,7 @@ static const struct net_device_ops mtk_n
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	.ndo_poll_controller	= mtk_poll_controller,
  #endif
@@ -78,7 +78,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
-@@ -3198,6 +3224,10 @@ static int mtk_probe(struct platform_dev
+@@ -3195,6 +3221,10 @@ static int mtk_probe(struct platform_dev
  				   eth->base + MTK_ETH_PPE_BASE, 2);
  		if (err)
  			goto err_free_dev;

target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch

@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
-@@ -485,7 +485,14 @@ extern int usb_hcd_pci_probe(struct pci_
+@@ -486,7 +486,14 @@ extern int usb_hcd_pci_probe(struct pci_
  extern void usb_hcd_pci_remove(struct pci_dev *dev);
  extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
  

target/linux/generic/pending-5.4/999-backport-wireless-ethernet-dispatch.patch

@@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  static int mtk_msg_level = -1;
  module_param_named(msg_level, mtk_msg_level, int, 0);
-@@ -3125,6 +3126,22 @@ static int mtk_probe(struct platform_device *pdev)
+@@ -3142,6 +3143,22 @@ static int mtk_probe(struct platform_dev
  		}
  	}
  

target/linux/ipq40xx/patches-5.4/900-arm-add-cmdline-override.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1826,6 +1826,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+@@ -1825,6 +1825,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
  
  endchoice
  

target/linux/ipq40xx/patches-5.4/995-add-qca-rfs-support.patch

@@ -125,7 +125,7 @@
  #endif
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -728,6 +728,7 @@ void phy_stop_machine(struct phy_device *phydev)
+@@ -728,6 +728,7 @@ void phy_stop_machine(struct phy_device
  		phydev->state = PHY_UP;
  	mutex_unlock(&phydev->lock);
  }
@@ -135,7 +135,7 @@
   * phy_error - enter HALTED state for this PHY device
 --- a/drivers/net/ppp/ppp_generic.c
 +++ b/drivers/net/ppp/ppp_generic.c
-@@ -3357,6 +3357,318 @@ static void *unit_find(struct idr *p, int n)
+@@ -3357,6 +3357,318 @@ static void *unit_find(struct idr *p, in
  	return idr_find(p, n);
  }
  
@@ -467,7 +467,7 @@
  /*
   * Determine initial path cost based on speed.
   * using recommendations from 802.1d standard
-@@ -695,6 +699,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
+@@ -695,6 +699,8 @@ int br_add_if(struct net_bridge *br, str
  
  	kobject_uevent(&p->kobj, KOBJ_ADD);
  
@@ -476,7 +476,7 @@
  	return 0;
  
  err7:
-@@ -731,6 +737,8 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
+@@ -731,6 +737,8 @@ int br_del_if(struct net_bridge *br, str
  	if (!p || p->br != br)
  		return -EINVAL;
  
@@ -485,7 +485,7 @@
  	/* Since more than one interface can be attached to a bridge,
  	 * there still maybe an alternate path for netconsole to use;
  	 * therefore there is no reason for a NETDEV_RELEASE event.
-@@ -785,6 +793,65 @@ void br_dev_update_stats(struct net_device *dev,
+@@ -785,6 +793,65 @@ void br_dev_update_stats(struct net_devi
  }
  EXPORT_SYMBOL_GPL(br_dev_update_stats);
  
@@ -553,7 +553,7 @@
  	struct net_bridge_port *p;
 --- a/net/bridge/br_fdb.c
 +++ b/net/bridge/br_fdb.c
-@@ -37,6 +37,33 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
+@@ -37,6 +37,33 @@ static int fdb_insert(struct net_bridge
  static void fdb_notify(struct net_bridge *br,
  		       const struct net_bridge_fdb_entry *, int, bool);
  
@@ -587,7 +587,7 @@
  int __init br_fdb_init(void)
  {
  	br_fdb_cache = kmem_cache_create("bridge_fdb_cache",
-@@ -337,6 +364,7 @@ void br_fdb_cleanup(struct work_struct *work)
+@@ -337,6 +364,7 @@ void br_fdb_cleanup(struct work_struct *
  	unsigned long delay = hold_time(br);
  	unsigned long work_delay = delay;
  	unsigned long now = jiffies;
@@ -595,7 +595,7 @@
  
  	/* this part is tricky, in order to avoid blocking learning and
  	 * consequently forwarding, we rely on rcu to delete objects with
-@@ -353,8 +381,11 @@ void br_fdb_cleanup(struct work_struct *work)
+@@ -353,8 +381,11 @@ void br_fdb_cleanup(struct work_struct *
  			work_delay = min(work_delay, this_timer - now);
  		} else {
  			spin_lock_bh(&br->hash_lock);
@@ -608,7 +608,7 @@
  			spin_unlock_bh(&br->hash_lock);
  		}
  	}
-@@ -587,6 +618,8 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
+@@ -587,6 +618,8 @@ void br_fdb_update(struct net_bridge *br
  				/* Take over HW learned entry */
  				if (unlikely(fdb->added_by_external_learn))
  					fdb->added_by_external_learn = 0;
@@ -617,7 +617,7 @@
  			}
  			if (now != fdb->updated)
  				fdb->updated = now;
-@@ -696,6 +729,23 @@ static void fdb_notify(struct net_bridge *br,
+@@ -696,6 +729,23 @@ static void fdb_notify(struct net_bridge
  	struct sk_buff *skb;
  	int err = -ENOBUFS;
  
@@ -641,7 +641,7 @@
  	if (swdev_notify)
  		br_switchdev_fdb_notify(br, fdb, type);
  
-@@ -1212,3 +1262,41 @@ void br_fdb_clear_offload(const struct net_device *dev, u16 vid)
+@@ -1212,3 +1262,41 @@ void br_fdb_clear_offload(const struct n
  	spin_unlock_bh(&p->br->hash_lock);
  }
  EXPORT_SYMBOL_GPL(br_fdb_clear_offload);

target/linux/ipq806x/patches-5.4/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch

@@ -33,7 +33,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -319,7 +319,7 @@ config ARCH_MULTIPLATFORM
+@@ -318,7 +318,7 @@ config ARCH_MULTIPLATFORM
  	depends on MMU
  	select ARM_HAS_SG_CHAIN
  	select ARM_PATCH_PHYS_VIRT

target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch

@@ -27,8 +27,8 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  {
  	struct __thermal_zone *data = tz->devdata;
  
--	if (!data->ops->get_temp)
+-	if (!data->ops || !data->ops->get_temp)
-+	if (!data->ops->get_temp || (data->mode == THERMAL_DEVICE_DISABLED))
++	if (!data->ops || !data->ops->get_temp || (data->mode == THERMAL_DEVICE_DISABLED))
  		return -EINVAL;
  
  	return data->ops->get_temp(data->sensor_data, temp);
@@ -42,9 +42,9 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  		return -EINVAL;
  
  	return data->ops->set_trips(data->sensor_data, low, high);
-@@ -188,6 +189,9 @@ static int of_thermal_set_emul_temp(stru
+@@ -191,6 +192,9 @@ static int of_thermal_set_emul_temp(stru
- {
+ 	if (!data->ops || !data->ops->set_emul_temp)
- 	struct __thermal_zone *data = tz->devdata;
+ 		return -EINVAL;
  
 +	if (data->mode == THERMAL_DEVICE_DISABLED)
 +		return -EINVAL;
@@ -52,16 +52,16 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  	return data->ops->set_emul_temp(data->sensor_data, temp);
  }
  
-@@ -196,7 +200,7 @@ static int of_thermal_get_trend(struct t
+@@ -199,7 +203,7 @@ static int of_thermal_get_trend(struct t
  {
  	struct __thermal_zone *data = tz->devdata;
  
--	if (!data->ops->get_trend)
+-	if (!data->ops || !data->ops->get_trend)
-+	if (!data->ops->get_trend || (data->mode == THERMAL_DEVICE_DISABLED))
++	if (!data->ops || !data->ops->get_trend || (data->mode == THERMAL_DEVICE_DISABLED))
  		return -EINVAL;
  
  	return data->ops->get_trend(data->sensor_data, trip, trend);
-@@ -297,7 +301,9 @@ static int of_thermal_set_mode(struct th
+@@ -300,7 +304,9 @@ static int of_thermal_set_mode(struct th
  	mutex_unlock(&tz->lock);
  
  	data->mode = mode;
@@ -72,7 +72,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  
  	return 0;
  }
-@@ -307,7 +313,8 @@ static int of_thermal_get_trip_type(stru
+@@ -310,7 +316,8 @@ static int of_thermal_get_trip_type(stru
  {
  	struct __thermal_zone *data = tz->devdata;
  
@@ -82,7 +82,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  		return -EDOM;
  
  	*type = data->trips[trip].type;
-@@ -315,12 +322,39 @@ static int of_thermal_get_trip_type(stru
+@@ -318,12 +325,39 @@ static int of_thermal_get_trip_type(stru
  	return 0;
  }
  
@@ -123,7 +123,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  		return -EDOM;
  
  	*temp = data->trips[trip].temperature;
-@@ -333,7 +367,8 @@ static int of_thermal_set_trip_temp(stru
+@@ -336,7 +370,8 @@ static int of_thermal_set_trip_temp(stru
  {
  	struct __thermal_zone *data = tz->devdata;
  
@@ -132,8 +132,8 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
 +				|| (data->mode == THERMAL_DEVICE_DISABLED))
  		return -EDOM;
  
- 	if (data->ops->set_trip_temp) {
+ 	if (data->ops && data->ops->set_trip_temp) {
-@@ -355,7 +390,8 @@ static int of_thermal_get_trip_hyst(stru
+@@ -358,7 +393,8 @@ static int of_thermal_get_trip_hyst(stru
  {
  	struct __thermal_zone *data = tz->devdata;
  
@@ -143,7 +143,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  		return -EDOM;
  
  	*hyst = data->trips[trip].hysteresis;
-@@ -368,7 +404,8 @@ static int of_thermal_set_trip_hyst(stru
+@@ -371,7 +407,8 @@ static int of_thermal_set_trip_hyst(stru
  {
  	struct __thermal_zone *data = tz->devdata;
  
@@ -153,7 +153,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  		return -EDOM;
  
  	/* thermal framework should take care of data->mask & (1 << trip) */
-@@ -443,6 +480,9 @@ thermal_zone_of_add_sensor(struct device
+@@ -446,6 +483,9 @@ thermal_zone_of_add_sensor(struct device
  	if (ops->set_emul_temp)
  		tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
  
@@ -163,7 +163,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  	mutex_unlock(&tzd->lock);
  
  	return tzd;
-@@ -765,7 +805,10 @@ static const char * const trip_types[] =
+@@ -768,7 +808,10 @@ static const char * const trip_types[] =
  	[THERMAL_TRIP_ACTIVE]	= "active",
  	[THERMAL_TRIP_PASSIVE]	= "passive",
  	[THERMAL_TRIP_HOT]	= "hot",

target/linux/ipq806x/patches-5.4/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
-@@ -1824,6 +1824,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1823,6 +1823,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.
  

target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1837,6 +1837,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+@@ -1836,6 +1836,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
  
  endchoice
  

target/linux/ipq806x/patches-5.4/990-00-Add-required-entries-in-dts-files-for-NSS-support.patch

@@ -1,5 +1,5 @@
---- b/arch/arm/boot/dts/qcom-ipq8064.dtsi
+--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
-+++ a/arch/arm/boot/dts/qcom-ipq8064.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 @@ -1456,6 +1456,12 @@
  			status = "disabled";
  		};

target/linux/ipq806x/patches-5.4/999-00-Regulator-Add-NSS-VOLT.patch

@@ -33,8 +33,8 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +obj-$(CONFIG_REGULATOR_NSS_VOLT) += nss-volt-ipq806x.o
  
  ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
---- a/dev/null
+--- /dev/null
---- b/drivers/regulator/nss-volt-ipq806x.c
++++ b/drivers/regulator/nss-volt-ipq806x.c
 @@ -0,0 +1,146 @@
 +/*
 + * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
@@ -182,9 +182,13 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +}
 +module_exit(nss_ipq806x_exit);
 +
---- a/dev/null
+--- a/include/linux/regulator/nss-volt-ipq806x.h
---- b/include/linux/regulator/nss-volt-ipq806x.h
++++ b/include/linux/regulator/nss-volt-ipq806x.h
-@@ -0,0 +1,25 @@
+@@ -22,3 +22,28 @@
+ int nss_ramp_voltage(unsigned long rate, bool ramp_up);
+ 
+ #endif
++
 +/*
 + * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
 + *
@@ -209,4 +213,3 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +int nss_ramp_voltage(unsigned long rate, bool ramp_up);
 +
 +#endif
-+

target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch

@@ -106,7 +106,7 @@
  		     __be16 vlan_proto, u16 vlan_id)
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1590,6 +1590,20 @@ enum netdev_priv_flags {
+@@ -1590,6 +1590,20 @@ enum netdev_ml_priv_type {
  	ML_PRIV_CAN,
  };
  
@@ -170,7 +170,7 @@
  	struct lock_class_key stats_lock_key;
 +	u32      id; /* QCA NSS ECM support */
  };
-
+ 
  #define bond_slave_get_rcu(dev) \
 @@ -757,4 +758,12 @@ static inline void bond_tx_drop(struct n
  	dev_kfree_skb_any(skb);
@@ -378,7 +378,7 @@
  	}
  }
  
-@@ -2780,3 +2848,101 @@ int bond_3ad_stats_fill(struct sk_buff *
+@@ -2775,3 +2843,101 @@ int bond_3ad_stats_fill(struct sk_buff *
  
  	return 0;
  }
@@ -484,13 +484,13 @@
 +++ b/drivers/net/bonding/bond_main.c
 @@ -199,6 +199,7 @@ atomic_t netpoll_block_tx = ATOMIC_INIT(
  #endif
-
+ 
  unsigned int bond_net_id __read_mostly;
 +static unsigned long bond_id_mask = 0xFFFFFFF0; /* QCA NSS ECM Support */
-
+ 
  /*-------------------------- Forward declarations ---------------------------*/
-
+ 
-@@ -847,6 +847,23 @@ void bond_change_active_slave(struct bon
+@@ -847,6 +848,23 @@ void bond_change_active_slave(struct bon
  			if (BOND_MODE(bond) == BOND_MODE_8023AD)
  				bond_3ad_handle_link_change(new_active, BOND_LINK_UP);
  
@@ -614,7 +614,7 @@
  }
  
  /* bond_mii_monitor
-@@ -4383,6 +4445,11 @@ static void bond_destructor(struct net_d
+@@ -4385,6 +4447,11 @@ static void bond_destructor(struct net_d
  	struct bonding *bond = netdev_priv(bond_dev);
  	if (bond->wq)
  		destroy_workqueue(bond->wq);
@@ -626,7 +626,7 @@
  }
  
  void bond_setup(struct net_device *bond_dev)
-@@ -4932,6 +4999,16 @@ int bond_create(struct net *net, const c
+@@ -4934,6 +5001,16 @@ int bond_create(struct net *net, const c
  	bond_work_init_all(bond);
  
  	rtnl_unlock();
@@ -643,7 +643,7 @@
  	return 0;
  }
  
-@@ -5027,6 +5104,203 @@ static void __exit bonding_exit(void)
+@@ -5029,6 +5106,203 @@ static void __exit bonding_exit(void)
  #endif
  }
  
@@ -1064,7 +1064,7 @@
  /*
   * Determine initial path cost based on speed.
   * using recommendations from 802.1d standard
-@@ -695,6 +701,8 @@
+@@ -695,6 +701,8 @@ int br_add_if(struct net_bridge *br, str
  
  	kobject_uevent(&p->kobj, KOBJ_ADD);
  
@@ -1073,7 +1073,7 @@
  	return 0;
  
  err7:
-@@ -730,6 +738,8 @@
+@@ -730,6 +738,8 @@ int br_del_if(struct net_bridge *br, str
  	p = br_port_get_rtnl(dev);
  	if (!p || p->br != br)
  		return -EINVAL;
@@ -1082,7 +1082,7 @@
  
  	/* Since more than one interface can be attached to a bridge,
  	 * there still maybe an alternate path for netconsole to use;
-@@ -785,6 +795,67 @@
+@@ -785,6 +795,67 @@ void br_dev_update_stats(struct net_devi
  }
  EXPORT_SYMBOL_GPL(br_dev_update_stats);
  
@@ -1150,7 +1150,6 @@
  bool br_port_flag_is_set(const struct net_device *dev, unsigned long flag)
  {
  	struct net_bridge_port *p;
-
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -1269,4 +1269,9 @@ void br_do_proxy_suppress_arp(struct sk_
@@ -1165,7 +1164,7 @@
  #endif
 --- a/net/core/neighbour.c
 +++ b/net/core/neighbour.c
-@@ -1208,7 +1208,21 @@ static void neigh_update_hhs(struct neig
+@@ -1223,7 +1223,21 @@ static void neigh_update_hhs(struct neig
  	}
  }
  
@@ -1187,7 +1186,7 @@
  
  /* Generic update routine.
     -- lladdr is new lladdr or NULL, if it is not supplied.
-@@ -1239,6 +1253,7 @@ static int __neigh_update(struct neighbo
+@@ -1254,6 +1268,7 @@ static int __neigh_update(struct neighbo
  	int notify = 0;
  	struct net_device *dev;
  	int update_isrouter = 0;
@@ -1195,7 +1194,7 @@
  
  	trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid);
  
-@@ -1248,6 +1263,8 @@ static int __neigh_update(struct neighbo
+@@ -1263,6 +1278,8 @@ static int __neigh_update(struct neighbo
  	old    = neigh->nud_state;
  	err    = -EPERM;
  
@@ -1204,7 +1203,7 @@
  	if (neigh->dead) {
  		NL_SET_ERR_MSG(extack, "Neighbor entry is now dead");
  		new = old;
-@@ -1290,6 +1307,11 @@ static int __neigh_update(struct neighbo
+@@ -1305,6 +1322,11 @@ static int __neigh_update(struct neighbo
  		   - compare new & old
  		   - if they are different, check override flag
  		 */
@@ -1216,7 +1215,7 @@
  		if ((old & NUD_VALID) &&
  		    !memcmp(lladdr, neigh->ha, dev->addr_len))
  			lladdr = neigh->ha;
-@@ -1412,8 +1434,11 @@ out:
+@@ -1427,8 +1449,11 @@ out:
  	if (((new ^ old) & NUD_PERMANENT) || ext_learn_change)
  		neigh_update_gc_list(neigh);
  
@@ -1284,7 +1283,7 @@
  	struct fib_table *tb;
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -7206,3 +7206,35 @@ void addrconf_cleanup(void)
+@@ -7202,3 +7202,35 @@ void addrconf_cleanup(void)
  
  	destroy_workqueue(addrconf_wq);
  }
@@ -1332,7 +1331,7 @@
  		   const struct in6_addr *daddr)
 --- a/net/ipv6/route.c
 +++ b/net/ipv6/route.c
-@@ -3784,6 +3784,9 @@ out:
+@@ -3784,6 +3784,9 @@ out_free:
  	return ERR_PTR(err);
  }
  
@@ -1363,7 +1362,7 @@
  out:
  	fib6_info_release(rt);
  	return err;
-@@ -6136,6 +6146,20 @@ static int ip6_route_dev_notify(struct n
+@@ -6143,6 +6153,20 @@ static int ip6_route_dev_notify(struct n
  	return NOTIFY_OK;
  }
  
@@ -1559,7 +1558,7 @@
  
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -136,6 +136,13 @@ config NF_CONNTRACK_TIMEOUT
+@@ -135,6 +135,13 @@ config NF_CONNTRACK_EVENTS
  
  	  If unsure, say `N'.
  
@@ -1583,4 +1582,3 @@
  
  obj-$(CONFIG_NETFILTER) = netfilter.o
  
-

target/linux/ipq806x/patches-5.4/999-03b-qca-nss-ecm-support.patch

@@ -1,6 +1,6 @@
 --- a/include/linux/if_bridge.h
 +++ b/include/linux/if_bridge.h
-@@ -54,6 +54,7 @@ extern void br_fdb_update_unregister_notify(struct notifier_block *nb);
+@@ -54,6 +54,7 @@ extern void brioctl_set(int (*ioctl_hook
  
  extern void br_dev_update_stats(struct net_device *dev,
  				struct rtnl_link_stats64 *nlstats);
@@ -78,7 +78,7 @@
  #endif /* _CONNTRACK_PROTO_GRE_H */
 --- a/include/net/addrconf.h
 +++ b/include/net/addrconf.h
-@@ -497,4 +497,9 @@ int if6_proc_init(void);
+@@ -500,4 +500,9 @@ int if6_proc_init(void);
  void if6_proc_exit(void);
  #endif
  
@@ -90,7 +90,7 @@
  #endif
 --- a/drivers/net/tun.c
 +++ b/drivers/net/tun.c
-@@ -2861,6 +2861,8 @@ static int tun_set_iff(struct net *net,
+@@ -2872,6 +2872,8 @@ static int tun_set_iff(struct net *net,
  				     ~(NETIF_F_HW_VLAN_CTAG_TX |
  				       NETIF_F_HW_VLAN_STAG_TX);
  
@@ -101,7 +101,7 @@
  
 --- a/net/ipv4/ip_gre.c
 +++ b/net/ipv4/ip_gre.c
-@@ -1297,6 +1297,7 @@ static void ipgre_tap_setup(struct net_d
+@@ -1302,6 +1302,7 @@ static void ipgre_tap_setup(struct net_d
  	dev->netdev_ops	= &gre_tap_netdev_ops;
  	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
  	dev->priv_flags	|= IFF_LIVE_ADDR_CHANGE;
@@ -111,7 +111,7 @@
  
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
-@@ -1912,6 +1912,7 @@ static void ip6gre_tap_setup(struct net_
+@@ -1917,6 +1917,7 @@ static void ip6gre_tap_setup(struct net_
  
  	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
  	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
@@ -121,7 +121,7 @@
  
 --- a/net/bridge/br_if.c
 +++ b/net/bridge/br_if.c
-@@ -796,6 +796,17 @@ void br_dev_update_stats(struct net_device *dev,
+@@ -796,6 +796,17 @@ void br_dev_update_stats(struct net_devi
  EXPORT_SYMBOL_GPL(br_dev_update_stats);
  
  /* QCA NSS ECM support - Start */

target/linux/ipq806x/patches-5.4/999-03c-qca-nss-pppoe-offload-support.patch

@@ -39,7 +39,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
   * Generic PPP layer for Linux.
   *
   * Copyright 1999-2002 Paul Mackerras.
-@@ -3357,6 +3373,178 @@ static void *unit_find(struct idr *p, int n)
+@@ -3357,6 +3373,178 @@ static void *unit_find(struct idr *p, in
  	return idr_find(p, n);
  }
  
@@ -246,7 +246,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
  
  /* per-net private data for this module */
  static unsigned int pppoe_net_id __read_mostly;
-@@ -652,6 +653,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
+@@ -652,6 +653,7 @@ static int pppoe_connect(struct socket *
  	if (stage_session(po->pppoe_pa.sid)) {
  		pppox_unbind_sock(sk);
  		pn = pppoe_pernet(sock_net(sk));
@@ -254,7 +254,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
  		delete_item(pn, po->pppoe_pa.sid,
  			    po->pppoe_pa.remote, po->pppoe_ifindex);
  		if (po->pppoe_dev) {
-@@ -699,7 +701,7 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
+@@ -699,7 +701,7 @@ static int pppoe_connect(struct socket *
  
  		po->chan.mtu = dev->mtu - sizeof(struct pppoe_hdr) - 2;
  		po->chan.private = sk;
@@ -263,7 +263,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
  
  		error = ppp_register_net_channel(dev_net(dev), &po->chan);
  		if (error) {
-@@ -1004,11 +1006,78 @@ static int pppoe_flow_offload_check(struct ppp_channel *chan,
+@@ -1004,11 +1006,78 @@ static int pppoe_flow_offload_check(stru
  }
  #endif /* CONFIG_NF_FLOW_TABLE */
  

target/linux/ipq806x/patches-5.4/999-03d-qca-nss-pppoe-offload-support.patch

@@ -18,7 +18,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
 
 --- a/drivers/net/ppp/ppp_generic.c
 +++ b/drivers/net/ppp/ppp_generic.c
-@@ -3376,7 +3376,9 @@ static void *unit_find(struct idr *p, int n)
+@@ -3376,7 +3376,9 @@ static void *unit_find(struct idr *p, in
  /* Updates the PPP interface statistics. */
  void ppp_update_stats(struct net_device *dev, unsigned long rx_packets,
  		      unsigned long rx_bytes, unsigned long tx_packets,
@@ -29,7 +29,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
  {
  	struct ppp *ppp;
  
-@@ -3391,11 +3393,15 @@ void ppp_update_stats(struct net_device *dev, unsigned long rx_packets,
+@@ -3391,11 +3393,15 @@ void ppp_update_stats(struct net_device
  	ppp_xmit_lock(ppp);
  	ppp->stats64.tx_packets += tx_packets;
  	ppp->stats64.tx_bytes += tx_bytes;
@@ -47,7 +47,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
  
 --- a/include/linux/ppp_channel.h
 +++ b/include/linux/ppp_channel.h
-@@ -82,7 +82,9 @@ extern int ppp_is_multilink(struct net_device *dev);
+@@ -82,7 +82,9 @@ extern int ppp_is_multilink(struct net_d
   */
  extern void ppp_update_stats(struct net_device *dev, unsigned long rx_packets,
  			     unsigned long rx_bytes, unsigned long tx_packets,
@@ -93,7 +93,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
   *****************************************************************************/
 --- a/net/l2tp/l2tp_core.h
 +++ b/net/l2tp/l2tp_core.h
-@@ -200,6 +200,8 @@ struct l2tp_session *l2tp_session_get(const struct net *net, u32 session_id);
+@@ -200,6 +200,8 @@ struct l2tp_session *l2tp_session_get(co
  struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth);
  struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,
  						const char *ifname);

target/linux/ipq806x/patches-5.4/999-03e-qca-nss-pppoe-offload-support.patch

@@ -14,7 +14,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
 
 --- a/drivers/net/ppp/ppp_generic.c
 +++ b/drivers/net/ppp/ppp_generic.c
-@@ -3395,6 +3395,8 @@ void ppp_update_stats(struct net_device *dev, unsigned long rx_packets,
+@@ -3395,6 +3395,8 @@ void ppp_update_stats(struct net_device
  	ppp->stats64.tx_bytes += tx_bytes;
  	ppp->dev->stats.tx_errors += tx_errors;
  	ppp->dev->stats.tx_dropped += tx_dropped;
@@ -23,7 +23,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
  	ppp_xmit_unlock(ppp);
  
  	ppp_recv_lock(ppp);
-@@ -3402,6 +3404,8 @@ void ppp_update_stats(struct net_device *dev, unsigned long rx_packets,
+@@ -3402,6 +3404,8 @@ void ppp_update_stats(struct net_device
  	ppp->stats64.rx_bytes += rx_bytes;
  	ppp->dev->stats.rx_errors += rx_errors;
  	ppp->dev->stats.rx_dropped += rx_dropped;

target/linux/ipq806x/patches-5.4/999-04-qca-nss-cfi-support.patch

@@ -1,6 +1,6 @@
 --- a/crypto/authenc.c
 +++ b/crypto/authenc.c
-@@ -449,6 +449,8 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
+@@ -449,6 +449,8 @@ static int crypto_authenc_create(struct
  
  	inst->alg.base.cra_flags = (auth_base->cra_flags |
  				    enc->base.cra_flags) & CRYPTO_ALG_ASYNC;
@@ -11,21 +11,21 @@
  	inst->alg.base.cra_blocksize = enc->base.cra_blocksize;
 --- a/include/linux/crypto.h
 +++ b/include/linux/crypto.h
-@@ -104,6 +104,11 @@
+@@ -105,6 +105,11 @@
-  */
  #define CRYPTO_NOLOAD			0x00008000
  
-+/*
+ /*
 + * Set this flag if algorithm does not support SG list transforms
 + */
 +#define CRYPTO_ALG_NOSUPP_SG		0x0000c000
 +
- /*
++/*
   * Transform masks and values (for crt_flags).
   */
+ #define CRYPTO_TFM_NEED_KEY		0x00000001
 --- a/net/ipv4/esp4.c
 +++ b/net/ipv4/esp4.c
-@@ -488,6 +488,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
+@@ -487,6 +487,7 @@ static int esp_output(struct xfrm_state
  	struct ip_esp_hdr *esph;
  	struct crypto_aead *aead;
  	struct esp_info esp;
@@ -33,7 +33,7 @@
  
  	esp.inplace = true;
  
-@@ -499,6 +500,11 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
+@@ -498,6 +499,11 @@ static int esp_output(struct xfrm_state
  	aead = x->data;
  	alen = crypto_aead_authsize(aead);
  
@@ -45,7 +45,7 @@
  	esp.tfclen = 0;
  	if (x->tfcpad) {
  		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
-@@ -708,6 +714,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
+@@ -707,6 +713,7 @@ static int esp_input(struct xfrm_state *
  	u8 *iv;
  	struct scatterlist *sg;
  	int err = -EINVAL;
@@ -53,7 +53,7 @@
  
  	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen))
  		goto out;
-@@ -715,6 +722,12 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
+@@ -714,6 +721,12 @@ static int esp_input(struct xfrm_state *
  	if (elen <= 0)
  		goto out;
  
@@ -68,7 +68,7 @@
  
 --- a/net/ipv6/esp6.c
 +++ b/net/ipv6/esp6.c
-@@ -429,6 +429,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
+@@ -428,6 +428,7 @@ static int esp6_output(struct xfrm_state
  	struct ip_esp_hdr *esph;
  	struct crypto_aead *aead;
  	struct esp_info esp;
@@ -76,7 +76,7 @@
  
  	esp.inplace = true;
  
-@@ -440,6 +441,11 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
+@@ -439,6 +440,11 @@ static int esp6_output(struct xfrm_state
  	aead = x->data;
  	alen = crypto_aead_authsize(aead);
  
@@ -88,7 +88,7 @@
  	esp.tfclen = 0;
  	if (x->tfcpad) {
  		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
-@@ -603,6 +609,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
+@@ -602,6 +608,7 @@ static int esp6_input(struct xfrm_state
  	__be32 *seqhi;
  	u8 *iv;
  	struct scatterlist *sg;
@@ -96,7 +96,7 @@
  
  	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) {
  		ret = -EINVAL;
-@@ -614,6 +621,12 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
+@@ -613,6 +620,12 @@ static int esp6_input(struct xfrm_state
  		goto out;
  	}
  

target/linux/ipq806x/patches-5.4/999-07b-qca-nss-clients-qdisc-support.patch

@@ -303,7 +303,7 @@
 @@ -767,7 +767,7 @@ static void qdisc_free_cb(struct rcu_hea
  	qdisc_free(q);
  }
-
+ 
 -static void qdisc_destroy(struct Qdisc *qdisc)
 +void qdisc_destroy(struct Qdisc *qdisc)
  {

target/linux/ipq806x/patches-5.4/999-07c-qca-nss-clients-ppp-support.patch

@@ -46,7 +46,7 @@
  	ppp_unlock(ppp);
  	ret = 0;
  
-@@ -3555,6 +3580,56 @@
+@@ -3555,6 +3580,56 @@ void ppp_release_channels(struct ppp_cha
  }
  EXPORT_SYMBOL(ppp_release_channels);
  
@@ -114,7 +114,7 @@
  	/* Hold the channel from being destroyed */
  	void (*hold)(struct ppp_channel *);
  	/* Release hold on the channel */
-@@ -69,6 +71,15 @@
+@@ -69,6 +71,15 @@ extern void ppp_channel_release(struct p
  extern void ppp_release_channels(struct ppp_channel *channels[],
  				 unsigned int chan_sz);
  

target/linux/ipq806x/patches-5.4/999-07d-qca-nss-clients-ppp-support.patch

@@ -1,6 +1,6 @@
 --- a/include/linux/ppp_channel.h
 +++ b/include/linux/ppp_channel.h
-@@ -135,5 +135,17 @@ extern void ppp_update_stats(struct net_
+@@ -135,5 +135,17 @@ extern char *ppp_dev_name(struct ppp_cha
   * that ppp_unregister_channel returns.
   */
  

target/linux/ipq806x/patches-5.4/999-07e-qca-nss-clients-iptunnel-support.patch

@@ -51,7 +51,7 @@
  	struct ip6_tnl *tunnel = netdev_priv(dev);
 --- a/net/ipv6/sit.c
 +++ b/net/ipv6/sit.c
-@@ -1739,6 +1739,23 @@ nla_put_failure:
+@@ -1737,6 +1737,23 @@ nla_put_failure:
  	return -EMSGSIZE;
  }
  

target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch

@@ -5480,7 +5480,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  	  (transaction layer end-to-end CRC checking).
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
-@@ -1392,6 +1392,8 @@ void pci_walk_bus(struct pci_bus *top, i
+@@ -1393,6 +1393,8 @@ void pci_walk_bus(struct pci_bus *top, i
  		  void *userdata);
  int pci_cfg_space_size(struct pci_dev *dev);
  unsigned char pci_bus_max_busnr(struct pci_bus *bus);
@@ -5491,7 +5491,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  					 unsigned long type);
 --- a/include/linux/pci_ids.h
 +++ b/include/linux/pci_ids.h
-@@ -1076,6 +1076,12 @@
+@@ -1078,6 +1078,12 @@
  #define PCI_DEVICE_ID_SGI_IOC3		0x0003
  #define PCI_DEVICE_ID_SGI_LITHIUM	0x1002
  

target/linux/lantiq/patches-5.4/0025-NET-MIPS-lantiq-adds-xrx200-legacy.patch

@@ -16,7 +16,7 @@ Subject: NET: MIPS: lantiq: adds xrx200 ethernet and switch driver
 
 --- a/drivers/net/ethernet/Kconfig
 +++ b/drivers/net/ethernet/Kconfig
-@@ -108,7 +108,13 @@ config LANTIQ_ETOP
+@@ -109,7 +109,13 @@ config LANTIQ_ETOP
  	tristate "Lantiq SoC ETOP driver"
  	depends on SOC_TYPE_XWAY
  	---help---

target/linux/lantiq/patches-5.4/0030-GPIO-add-named-gpio-exports.patch

@@ -22,7 +22,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -915,3 +917,72 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -917,3 +919,72 @@ void of_gpiochip_remove(struct gpio_chip
  {
  	of_node_put(chip->of_node);
  }

target/linux/lantiq/patches-5.4/0152-lantiq-VPE.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2385,6 +2385,12 @@ config MIPS_VPE_LOADER
+@@ -2383,6 +2383,12 @@ config MIPS_VPE_LOADER
  	  Includes a loader for loading an elf relocatable object
  	  onto another VPE and running it.
  

target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch

@@ -63,8 +63,8 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
   * address space as memory. Needed when the kernel wants to execute
 --- a/arch/arm/mm/mmu.c
 +++ b/arch/arm/mm/mmu.c
-@@ -316,6 +316,13 @@ static struct mem_type mem_types[] __ro_
+@@ -323,6 +323,13 @@ static struct mem_type mem_types[] __ro_
- 		.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
+ 		.prot_sect = PMD_TYPE_SECT,
  		.domain    = DOMAIN_KERNEL,
  	},
 +	[MT_MEMORY_RW_NS] = {
@@ -77,7 +77,7 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
  	[MT_ROM] = {
  		.prot_sect = PMD_TYPE_SECT,
  		.domain    = DOMAIN_KERNEL,
-@@ -652,6 +659,7 @@ static void __init build_mem_type_table(
+@@ -663,6 +670,7 @@ static void __init build_mem_type_table(
  	}
  	kern_pgprot |= PTE_EXT_AF;
  	vecs_pgprot |= PTE_EXT_AF;
@@ -85,11 +85,11 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
  
  	/*
  	 * Set PXN for user mappings
-@@ -680,6 +688,7 @@ static void __init build_mem_type_table(
+@@ -691,6 +699,7 @@ static void __init build_mem_type_table(
  	mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
  	mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
  	mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
 +	mem_types[MT_MEMORY_RW_NS].prot_sect |= ecc_mask | cp->pmd;
+ 	mem_types[MT_MEMORY_RO].prot_sect |= ecc_mask | cp->pmd;
+ 	mem_types[MT_MEMORY_RO].prot_pte |= kern_pgprot;
  	mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
- 	mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
- 	mem_types[MT_ROM].prot_sect |= cp->pmd;

target/linux/layerscape/patches-5.4/301-arch-0011-drivers-soc-fsl-add-qixis-driver.patch

@@ -16,7 +16,7 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
 
 --- a/drivers/soc/fsl/Kconfig
 +++ b/drivers/soc/fsl/Kconfig
-@@ -40,4 +40,15 @@ config DPAA2_CONSOLE
+@@ -41,4 +41,15 @@ config DPAA2_CONSOLE
  	  /dev/dpaa2_mc_console and /dev/dpaa2_aiop_console,
  	  which can be used to dump the Management Complex and AIOP
  	  firmware logs.

target/linux/layerscape/patches-5.4/301-arch-0012-soc-fsl-select-MFD_CORE-for-qixis-driver.patch

@@ -12,7 +12,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 
 --- a/drivers/soc/fsl/Kconfig
 +++ b/drivers/soc/fsl/Kconfig
-@@ -46,6 +46,7 @@ config FSL_QIXIS
+@@ -47,6 +47,7 @@ config FSL_QIXIS
  	depends on OF
  	select REGMAP_I2C
  	select REGMAP_MMIO

target/linux/layerscape/patches-5.4/302-dts-0071-arm-dts-ls1021a-replace-ftm0-with-ftm_alarm0-DT-node.patch

@@ -24,7 +24,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  	};
  
  	cpus {
-@@ -549,16 +549,6 @@
+@@ -549,16 +550,6 @@
  			status = "disabled";
  		};
  

target/linux/layerscape/patches-5.4/303-core-0001-net-readd-skb_recycle.patch

@@ -14,7 +14,7 @@ Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1025,6 +1025,7 @@ void skb_dump(const char *level, const s
+@@ -1029,6 +1029,7 @@ void skb_dump(const char *level, const s
  void skb_tx_error(struct sk_buff *skb);
  void consume_skb(struct sk_buff *skb);
  void __consume_stateless_skb(struct sk_buff *skb);

target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch

@@ -27,7 +27,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/* internal flags, do not use outside cgroup core proper */
  	__CFTYPE_ONLY_ON_DFL	= (1 << 16),	/* only on default hierarchy */
  	__CFTYPE_NOT_ON_DFL	= (1 << 17),	/* not on default hierarchy */
-@@ -544,6 +546,7 @@ struct cftype {
+@@ -545,6 +547,7 @@ struct cftype {
  	 * end of cftype array.
  	 */
  	char name[MAX_CFTYPE_NAME];
@@ -37,7 +37,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/*
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -1465,8 +1465,8 @@ struct cgroup *task_cgroup_from_root(str
+@@ -1468,8 +1468,8 @@ struct cgroup *task_cgroup_from_root(str
  
  static struct kernfs_syscall_ops cgroup_kf_syscall_ops;
  
@@ -48,7 +48,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  {
  	struct cgroup_subsys *ss = cft->ss;
  
-@@ -1476,13 +1476,26 @@ static char *cgroup_file_name(struct cgr
+@@ -1479,13 +1479,26 @@ static char *cgroup_file_name(struct cgr
  
  		snprintf(buf, CGROUP_FILE_NAME_MAX, "%s%s.%s",
  			 dbg, cgroup_on_dfl(cgrp) ? ss->name : ss->legacy_name,
@@ -77,7 +77,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  /**
   * cgroup_file_mode - deduce file mode of a control file
   * @cft: the control file in question
-@@ -1641,6 +1654,9 @@ static void cgroup_rm_file(struct cgroup
+@@ -1644,6 +1657,9 @@ static void cgroup_rm_file(struct cgroup
  	}
  
  	kernfs_remove_by_name(cgrp->kn, cgroup_file_name(cgrp, cft, name));
@@ -87,7 +87,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  }
  
  /**
-@@ -3896,6 +3912,7 @@ static int cgroup_add_file(struct cgroup
+@@ -3994,6 +4010,7 @@ static int cgroup_add_file(struct cgroup
  {
  	char name[CGROUP_FILE_NAME_MAX];
  	struct kernfs_node *kn;
@@ -95,7 +95,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	struct lock_class_key *key = NULL;
  	int ret;
  
-@@ -3926,6 +3943,14 @@ static int cgroup_add_file(struct cgroup
+@@ -4024,6 +4041,14 @@ static int cgroup_add_file(struct cgroup
  		spin_unlock_irq(&cgroup_file_kn_lock);
  	}
  

target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch

@@ -29,7 +29,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/* internal flags, do not use outside cgroup core proper */
  	__CFTYPE_ONLY_ON_DFL	= (1 << 16),	/* only on default hierarchy */
  	__CFTYPE_NOT_ON_DFL	= (1 << 17),	/* not on default hierarchy */
-@@ -546,7 +544,6 @@ struct cftype {
+@@ -547,7 +545,6 @@ struct cftype {
  	 * end of cftype array.
  	 */
  	char name[MAX_CFTYPE_NAME];
@@ -39,7 +39,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	/*
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -1465,8 +1465,8 @@ struct cgroup *task_cgroup_from_root(str
+@@ -1468,8 +1468,8 @@ struct cgroup *task_cgroup_from_root(str
  
  static struct kernfs_syscall_ops cgroup_kf_syscall_ops;
  
@@ -50,7 +50,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  {
  	struct cgroup_subsys *ss = cft->ss;
  
-@@ -1476,26 +1476,13 @@ static char *cgroup_fill_name(struct cgr
+@@ -1479,26 +1479,13 @@ static char *cgroup_fill_name(struct cgr
  
  		snprintf(buf, CGROUP_FILE_NAME_MAX, "%s%s.%s",
  			 dbg, cgroup_on_dfl(cgrp) ? ss->name : ss->legacy_name,
@@ -79,7 +79,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  /**
   * cgroup_file_mode - deduce file mode of a control file
   * @cft: the control file in question
-@@ -1654,9 +1641,6 @@ static void cgroup_rm_file(struct cgroup
+@@ -1657,9 +1644,6 @@ static void cgroup_rm_file(struct cgroup
  	}
  
  	kernfs_remove_by_name(cgrp->kn, cgroup_file_name(cgrp, cft, name));
@@ -89,7 +89,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  }
  
  /**
-@@ -3912,7 +3896,6 @@ static int cgroup_add_file(struct cgroup
+@@ -4010,7 +3994,6 @@ static int cgroup_add_file(struct cgroup
  {
  	char name[CGROUP_FILE_NAME_MAX];
  	struct kernfs_node *kn;
@@ -97,7 +97,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  	struct lock_class_key *key = NULL;
  	int ret;
  
-@@ -3943,14 +3926,6 @@ static int cgroup_add_file(struct cgroup
+@@ -4041,14 +4024,6 @@ static int cgroup_add_file(struct cgroup
  		spin_unlock_irq(&cgroup_file_kn_lock);
  	}
  

target/linux/layerscape/patches-5.4/701-net-0130-bus-fsl-mc-move-fsl_mc_command-struct-in-a-uapi-head.patch

@@ -16,7 +16,7 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13438,6 +13438,8 @@ S:	Maintained
+@@ -13437,6 +13437,8 @@ S:	Maintained
  F:	drivers/bus/fsl-mc/
  F:	Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
  F:	Documentation/networking/device_drivers/freescale/dpaa2/overview.rst

target/linux/layerscape/patches-5.4/701-net-0132-bus-fsl-mc-add-root-dprc-rescan-attribute.patch

@@ -31,7 +31,7 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
 +Users:		Userspace drivers and management tools
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13440,6 +13440,7 @@ F:	Documentation/devicetree/bindings/mis
+@@ -13439,6 +13439,7 @@ F:	Documentation/devicetree/bindings/mis
  F:	Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
  F:	Documentation/networking/dpaa2/overview.rst
  F:	include/uapi/linux/fsl_mc.h

target/linux/layerscape/patches-5.4/701-net-0261-net-mscc-ocelot-publish-ocelot_sys.h-to-include-soc-.patch

@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -10826,6 +10826,7 @@ M:	Microchip Linux Driver Support <UNGLi
+@@ -10825,6 +10825,7 @@ M:	Microchip Linux Driver Support <UNGLi
  L:	netdev@vger.kernel.org
  S:	Supported
  F:	drivers/net/ethernet/mscc/

target/linux/layerscape/patches-5.4/701-net-0323-staging-fsl_ppfe-eth-add-pfe-support-to-Kconfig-and-.patch

@@ -15,7 +15,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -6576,6 +6576,14 @@ F:	drivers/ptp/ptp_qoriq_debugfs.c
+@@ -6575,6 +6575,14 @@ F:	drivers/ptp/ptp_qoriq_debugfs.c
  F:	include/linux/fsl/ptp_qoriq.h
  F:	Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
  

target/linux/layerscape/patches-5.4/701-net-0327-at803x-Address-packet-drops-at-low-traffic-rate-due-.patch

@@ -22,7 +22,7 @@ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -363,6 +363,16 @@ config AT803X_PHY
+@@ -367,6 +367,16 @@ config AT803X_PHY
  	---help---
  	  Currently supports the AT8030 and AT8035 model
  

target/linux/layerscape/patches-5.4/701-net-0328-net-phy-Inphi-IN112525_s03-retimer-support.patch

@@ -15,7 +15,7 @@ Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -471,6 +471,11 @@ config ICPLUS_PHY
+@@ -475,6 +475,11 @@ config ICPLUS_PHY
  	---help---
  	  Currently supports the IP175C and IP1001 PHYs.
  
@@ -29,7 +29,7 @@ Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
  	---help---
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -86,6 +86,7 @@ obj-$(CONFIG_DP83848_PHY)	+= dp83848.o
+@@ -87,6 +87,7 @@ obj-$(CONFIG_DP83848_PHY)	+= dp83848.o
  obj-$(CONFIG_DP83867_PHY)	+= dp83867.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed_phy.o
  obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o

target/linux/layerscape/patches-5.4/701-net-0380-net-phylink-add-support-for-polling-MAC-PCS.patch

@@ -47,7 +47,7 @@ during v5.5-rc1.
  
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -1013,7 +1013,8 @@ void phylink_start(struct phylink *pl)
+@@ -1008,7 +1008,8 @@ void phylink_start(struct phylink *pl)
  		if (irq <= 0)
  			mod_timer(&pl->link_poll, jiffies + HZ);
  	}

target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch

@@ -86,42 +86,30 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5.
  	if (err) {
 --- a/sound/soc/codecs/msm8916-wcd-analog.c
 +++ b/sound/soc/codecs/msm8916-wcd-analog.c
-@@ -1195,8 +1195,10 @@ static int pm8916_wcd_analog_spmi_probe(
+@@ -1196,6 +1196,7 @@ static int pm8916_wcd_analog_spmi_probe(
- 	}
  
  	irq = platform_get_irq_byname(pdev, "mbhc_switch_int");
--	if (irq < 0)
+ 	if (irq < 0) {
-+	if (irq < 0) {
 +		dev_err(dev, "failed to get mbhc switch irq\n");
- 		return irq;
+ 		ret = irq;
-+	}
+ 		goto err_disable_clk;
- 
+ 	}
- 	ret = devm_request_threaded_irq(dev, irq, NULL,
+@@ -1211,6 +1212,7 @@ static int pm8916_wcd_analog_spmi_probe(
- 			       pm8916_mbhc_switch_irq_handler,
-@@ -1208,8 +1210,10 @@ static int pm8916_wcd_analog_spmi_probe(
- 
  	if (priv->mbhc_btn_enabled) {
  		irq = platform_get_irq_byname(pdev, "mbhc_but_press_det");
--		if (irq < 0)
+ 		if (irq < 0) {
-+		if (irq < 0) {
 +			dev_err(dev, "failed to get button press irq\n");
- 			return irq;
+ 			ret = irq;
-+		}
+ 			goto err_disable_clk;
- 
+ 		}
- 		ret = devm_request_threaded_irq(dev, irq, NULL,
+@@ -1225,6 +1227,7 @@ static int pm8916_wcd_analog_spmi_probe(
- 				       mbhc_btn_press_irq_handler,
-@@ -1220,8 +1224,10 @@ static int pm8916_wcd_analog_spmi_probe(
- 			dev_err(dev, "cannot request mbhc button press irq\n");
  
  		irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det");
--		if (irq < 0)
+ 		if (irq < 0) {
-+		if (irq < 0) {
 +			dev_err(dev, "failed to get button release irq\n");
- 			return irq;
+ 			ret = irq;
-+		}
+ 			goto err_disable_clk;
- 
+ 		}
- 		ret = devm_request_threaded_irq(dev, irq, NULL,
- 				       mbhc_btn_release_irq_handler,
 --- a/sound/soc/codecs/twl6040.c
 +++ b/sound/soc/codecs/twl6040.c
 @@ -1108,8 +1108,10 @@ static int twl6040_probe(struct snd_soc_
@@ -278,7 +266,7 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5.
  	if (ret) {
 --- a/sound/soc/mxs/mxs-saif.c
 +++ b/sound/soc/mxs/mxs-saif.c
-@@ -790,8 +790,12 @@ static int mxs_saif_probe(struct platfor
+@@ -794,8 +794,12 @@ static int mxs_saif_probe(struct platfor
  		return PTR_ERR(saif->base);
  
  	irq = platform_get_irq(pdev, 0);

target/linux/layerscape/patches-5.4/809-jailhouse-0020-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch

@@ -21,7 +21,7 @@ From http://git.kiszka.org/?p=linux.git;a=shortlog;h=refs/heads/queues/jailhouse
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -8774,6 +8774,7 @@ L:	jailhouse-dev@googlegroups.com
+@@ -8773,6 +8773,7 @@ L:	jailhouse-dev@googlegroups.com
  S:	Maintained
  F:	arch/x86/kernel/jailhouse.c
  F:	arch/x86/include/asm/jailhouse_para.h

target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch

@@ -100,7 +100,7 @@ Reviewed-by: Sahil Malhotra <sahil.malhotra@nxp.com>
 +	$ keyctl load secure kmk-master "load 'cat secure_key.blob'" @u
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -9075,6 +9075,17 @@ F:	include/keys/trusted-type.h
+@@ -9074,6 +9074,17 @@ F:	include/keys/trusted-type.h
  F:	security/keys/trusted.c
  F:	include/keys/trusted.h
  

target/linux/layerscape/patches-5.4/810-keys-0002-encrypted_keys-Adds-support-for-secure-key-type-as-m.patch

@@ -23,7 +23,7 @@ Reviewed-by: Sahil Malhotra <sahil.malhotra@nxp.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -9085,6 +9085,7 @@ F:	include/keys/secure-type.h
+@@ -9084,6 +9084,7 @@ F:	include/keys/secure-type.h
  F:	security/keys/secure_key.c
  F:	security/keys/securekey_desc.c
  F:	security/keys/securekey_desc.h

target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch

@@ -229,7 +229,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
  	 * fall back to INTx or other interrupts, e.g., a system shared
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
-@@ -2024,6 +2024,7 @@ static inline void pcibios_penalize_isa_
+@@ -2025,6 +2025,7 @@ static inline void pcibios_penalize_isa_
  int pcibios_alloc_irq(struct pci_dev *dev);
  void pcibios_free_irq(struct pci_dev *dev);
  resource_size_t pcibios_default_alignment(void);

target/linux/layerscape/patches-5.4/812-pcie-0009-PCI-mobiveil-Refactor-Mobiveil-PCIe-Host-Bridge-IP-d.patch

@@ -34,7 +34,7 @@ Reviewed-by: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12504,7 +12504,7 @@ M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
+@@ -12503,7 +12503,7 @@ M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
  L:	linux-pci@vger.kernel.org
  S:	Supported
  F:	Documentation/devicetree/bindings/pci/mobiveil-pcie.txt

target/linux/layerscape/patches-5.4/812-pcie-0016-PCI-mobiveil-Add-the-EP-driver-support.patch

@@ -20,7 +20,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12501,6 +12501,7 @@ F:	drivers/ntb/hw/mscc/
+@@ -12500,6 +12500,7 @@ F:	drivers/ntb/hw/mscc/
  PCI DRIVER FOR MOBIVEIL PCIE IP
  M:	Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in>
  M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

target/linux/layerscape/patches-5.4/813-pm-0001-soc-fsl-add-RCPM-driver.patch

@@ -24,7 +24,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 
 --- a/drivers/soc/fsl/Kconfig
 +++ b/drivers/soc/fsl/Kconfig
-@@ -52,4 +52,13 @@ config FSL_QIXIS
+@@ -53,4 +53,13 @@ config FSL_QIXIS
  	  Say y here to enable QIXIS system controller api. The qixis driver
  	  provides FPGA functions to control system.
  

target/linux/layerscape/patches-5.4/813-pm-0003-drivers-soc-fsl-add-EPU-FSM-configuration-for-deep-s.patch

@@ -26,7 +26,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
 
 --- a/drivers/soc/fsl/Kconfig
 +++ b/drivers/soc/fsl/Kconfig
-@@ -31,6 +31,13 @@ config FSL_MC_DPIO
+@@ -32,6 +32,13 @@ config FSL_MC_DPIO
  	  objects individually, but groups them under a service layer
  	  API.
  

target/linux/layerscape/patches-5.4/813-pm-0004-PM-wakeup-Add-routine-to-help-fetch-wakeup-source-ob.patch

@@ -20,7 +20,7 @@ Acked-by: Anson Huang <Anson.Huang@nxp.com>
 
 --- a/drivers/base/power/wakeup.c
 +++ b/drivers/base/power/wakeup.c
-@@ -250,6 +250,60 @@ void wakeup_source_unregister(struct wak
+@@ -251,6 +251,60 @@ void wakeup_source_unregister(struct wak
  EXPORT_SYMBOL_GPL(wakeup_source_unregister);
  
  /**

target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch

@@ -12,7 +12,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -6598,6 +6598,12 @@ F:	drivers/soc/fsl/qe/
+@@ -6597,6 +6597,12 @@ F:	drivers/soc/fsl/qe/
  F:	include/soc/fsl/*qe*.h
  F:	include/soc/fsl/*ucc*.h
  

target/linux/layerscape/patches-5.4/816-sdhc-0001-mmc-sdhci-of-esdhc-poll-ESDHC_FLUSH_ASYNC_FIFO-bit-u.patch

@@ -14,7 +14,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 
 --- a/drivers/mmc/host/sdhci-of-esdhc.c
 +++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -592,6 +592,32 @@ static void esdhc_clock_enable(struct sd
+@@ -596,6 +596,32 @@ static void esdhc_clock_enable(struct sd
  	}
  }
  
@@ -47,7 +47,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
  {
  	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-@@ -684,9 +710,7 @@ static void esdhc_of_set_clock(struct sd
+@@ -688,9 +714,7 @@ static void esdhc_of_set_clock(struct sd
  		sdhci_writel(host, temp | ESDHC_HS400_WNDW_ADJUST, ESDHC_TBCTL);
  
  		esdhc_clock_enable(host, false);
@@ -58,7 +58,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  	}
  
  	/* Wait max 20 ms */
-@@ -888,10 +912,7 @@ static void esdhc_tuning_block_enable(st
+@@ -893,10 +917,7 @@ static void esdhc_tuning_block_enable(st
  	u32 val;
  
  	esdhc_clock_enable(host, false);

target/linux/layerscape/patches-5.4/816-sdhc-0002-LF-605-mmc-sdhci-of-esdhc-convert-to-use-esdhc_tunin.patch

@@ -15,7 +15,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
 
 --- a/drivers/mmc/host/sdhci-of-esdhc.c
 +++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -924,20 +924,11 @@ static void esdhc_tuning_block_enable(st
+@@ -929,20 +929,11 @@ static void esdhc_tuning_block_enable(st
  	esdhc_clock_enable(host, true);
  }
  
@@ -37,7 +37,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  	/* Write TBCTL[11:8]=4'h8 */
  	val = sdhci_readl(host, ESDHC_TBCTL);
  	val &= ~(0xf << 8);
-@@ -956,6 +947,25 @@ static void esdhc_prepare_sw_tuning(stru
+@@ -961,6 +952,25 @@ static void esdhc_prepare_sw_tuning(stru
  	val = sdhci_readl(host, ESDHC_TBSTAT);
  	val = sdhci_readl(host, ESDHC_TBSTAT);
  
@@ -63,7 +63,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  	/* Reset data lines by setting ESDHCCTL[RSTD] */
  	sdhci_reset(host, SDHCI_RESET_DATA);
  	/* Write 32'hFFFF_FFFF to IRQSTAT register */
-@@ -966,10 +976,8 @@ static void esdhc_prepare_sw_tuning(stru
+@@ -971,10 +981,8 @@ static void esdhc_prepare_sw_tuning(stru
  	 * then program TBPTR[TB_WNDW_END_PTR] = 4 * div_ratio
  	 * and program TBPTR[TB_WNDW_START_PTR] = 8 * div_ratio.
  	 */

target/linux/layerscape/patches-5.4/816-sdhc-0003-LF-605-mmc-sdhci-of-esdhc-update-tuning-erratum-A-00.patch

@@ -20,7 +20,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
 
 --- a/drivers/mmc/host/sdhci-of-esdhc.c
 +++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -890,20 +890,20 @@ static int esdhc_signal_voltage_switch(s
+@@ -895,20 +895,20 @@ static int esdhc_signal_voltage_switch(s
  }
  
  static struct soc_device_attribute soc_tuning_erratum_type1[] = {
@@ -51,7 +51,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  	{ },
  };
  
-@@ -971,13 +971,13 @@ static void esdhc_prepare_sw_tuning(stru
+@@ -976,13 +976,13 @@ static void esdhc_prepare_sw_tuning(stru
  	/* Write 32'hFFFF_FFFF to IRQSTAT register */
  	sdhci_writel(host, 0xFFFFFFFF, SDHCI_INT_STATUS);
  
@@ -68,7 +68,7 @@ Acked-by: Adrian Hunter <adrian.hunter@intel.com>
  		*window_start = 8 * esdhc->div_ratio;
  		*window_end = 4 * esdhc->div_ratio;
  	} else {
-@@ -1061,6 +1061,19 @@ static int esdhc_execute_tuning(struct m
+@@ -1066,6 +1066,19 @@ static int esdhc_execute_tuning(struct m
  		if (ret)
  			break;