generic: 5.15: refresh backport patch

Use 'make target/linux/refresh' to refresh backport patches.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

target/linux/generic/backport-5.15/011-kbuild-export-SUBARCH.patch

@@ -10,12 +10,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -507,7 +507,7 @@ KBUILD_LDFLAGS_MODULE :=
+@@ -523,7 +523,7 @@ KBUILD_LDFLAGS_MODULE :=
  KBUILD_LDFLAGS :=
  CLANG_FLAGS :=
 
 -export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
 +export ARCH SRCARCH SUBARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
  export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL
- export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
+ export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
  export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD

target/linux/generic/backport-5.15/050-v5.16-05-mips-bpf-Enable-eBPF-JITs.patch

@@ -14,7 +14,7 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3294,6 +3294,7 @@ S:	Supported
+@@ -3428,6 +3428,7 @@ S:	Supported
  F:	arch/arm64/net/
 
  BPF JIT for MIPS (32-BIT AND 64-BIT)
@@ -24,15 +24,15 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
  L:	bpf@vger.kernel.org
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -49,7 +49,6 @@ config MIPS
+@@ -57,7 +57,6 @@ config MIPS
  	select HAVE_ARCH_TRACEHOOK
  	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
  	select HAVE_ASM_MODVERSIONS
 -	select HAVE_CBPF_JIT if !64BIT && !CPU_MICROMIPS
  	select HAVE_CONTEXT_TRACKING
  	select HAVE_TIF_NOHZ
  	select HAVE_C_RECORDMCOUNT
-@@ -57,7 +56,10 @@ config MIPS
+@@ -65,7 +64,10 @@ config MIPS
  	select HAVE_DEBUG_STACKOVERFLOW
  	select HAVE_DMA_CONTIGUOUS
  	select HAVE_DYNAMIC_FTRACE

target/linux/generic/backport-5.15/081-net-next-regmap-allow-to-define-reg_update_bits-for-no-bus.patch

@@ -19,7 +19,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 
 --- a/drivers/base/regmap/regmap.c
 +++ b/drivers/base/regmap/regmap.c
-@@ -842,6 +842,7 @@ struct regmap *__regmap_init(struct devi
+@@ -877,6 +877,7 @@ struct regmap *__regmap_init(struct devi
  	if (!bus) {
  		map->reg_read  = config->reg_read;
  		map->reg_write = config->reg_write;
@@ -29,7 +29,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
  		goto skip_format_initialization;
 --- a/include/linux/regmap.h
 +++ b/include/linux/regmap.h
-@@ -289,6 +289,11 @@ typedef void (*regmap_unlock)(void *);
+@@ -290,6 +290,11 @@ typedef void (*regmap_unlock)(void *);
   *		  read operation on a bus such as SPI, I2C, etc. Most of the
   *		  devices do not need this.
   * @reg_write:	  Same as above for writing.
@@ -41,7 +41,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
   * @fast_io:	  Register IO is fast. Use a spinlock instead of a mutex
   *	     	  to perform locking. This field is ignored if custom lock/unlock
   *	     	  functions are used (see fields lock/unlock of struct regmap_config).
-@@ -366,6 +371,8 @@ struct regmap_config {
+@@ -372,6 +377,8 @@ struct regmap_config {
 
  	int (*reg_read)(void *context, unsigned int reg, unsigned int *val);
  	int (*reg_write)(void *context, unsigned int reg, unsigned int val);

target/linux/generic/backport-5.15/300-v5.18-pinctrl-qcom-Return--EINVAL-for-setting-affinity-if-no-IRQ-parent.patch

@@ -26,11 +26,9 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  drivers/pinctrl/qcom/pinctrl-msm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
-index 8476a8ac4451..a42ff4b22a04 100644
 --- a/drivers/pinctrl/qcom/pinctrl-msm.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
-@@ -1157,7 +1157,7 @@ static int msm_gpio_irq_set_affinity(struct irq_data *d,
+@@ -1157,7 +1157,7 @@ static int msm_gpio_irq_set_affinity(str
  	if (d->parent_data && test_bit(d->hwirq, pctrl->skip_wake_irqs))
  		return irq_chip_set_affinity_parent(d, dest, force);
 
@@ -39,7 +37,7 @@ index 8476a8ac4451..a42ff4b22a04 100644
  }
 
  static int msm_gpio_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info)
-@@ -1168,7 +1168,7 @@ static int msm_gpio_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info)
+@@ -1168,7 +1168,7 @@ static int msm_gpio_irq_set_vcpu_affinit
  	if (d->parent_data && test_bit(d->hwirq, pctrl->skip_wake_irqs))
  		return irq_chip_set_vcpu_affinity_parent(d, vcpu_info);
 

target/linux/generic/backport-5.15/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch

@@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 
 --- a/net/netfilter/nf_flow_table_core.c
 +++ b/net/netfilter/nf_flow_table_core.c
-@@ -576,13 +576,41 @@ void nf_flow_table_free(struct nf_flowta
+@@ -646,13 +646,41 @@ void nf_flow_table_free(struct nf_flowta
  }
  EXPORT_SYMBOL_GPL(nf_flow_table_free);
 
@@ -55,7 +55,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 
 --- a/net/netfilter/nft_flow_offload.c
 +++ b/net/netfilter/nft_flow_offload.c
-@@ -237,47 +237,14 @@ static struct nft_expr_type nft_flow_off
+@@ -438,47 +438,14 @@ static struct nft_expr_type nft_flow_off
  	.owner		= THIS_MODULE,
  };
 

target/linux/generic/backport-5.15/700-net-next-net-dsa-introduce-tagger-owned-storage-for-private.patch

@@ -67,11 +67,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  net/dsa/switch.c   | 14 +++++++++++
  4 files changed, 96 insertions(+), 4 deletions(-)
 
-diff --git a/include/net/dsa.h b/include/net/dsa.h
-index bdf308a5c55ee..8b496c7e62ef8 100644
 --- a/include/net/dsa.h
 +++ b/include/net/dsa.h
-@@ -82,12 +82,15 @@ enum dsa_tag_protocol {
+@@ -80,12 +80,15 @@ enum dsa_tag_protocol {
  };
 
  struct dsa_switch;
@@ -87,7 +85,7 @@ index bdf308a5c55ee..8b496c7e62ef8 100644
  	unsigned int needed_headroom;
  	unsigned int needed_tailroom;
  	const char *name;
-@@ -337,6 +340,8 @@ struct dsa_switch {
+@@ -329,6 +332,8 @@ struct dsa_switch {
  	 */
  	void *priv;
 
@@ -96,7 +94,7 @@ index bdf308a5c55ee..8b496c7e62ef8 100644
  	/*
  	 * Configuration data for this switch.
  	 */
-@@ -689,6 +694,13 @@ struct dsa_switch_ops {
+@@ -584,6 +589,13 @@ struct dsa_switch_ops {
  						  enum dsa_tag_protocol mprot);
  	int	(*change_tag_protocol)(struct dsa_switch *ds, int port,
  				       enum dsa_tag_protocol proto);
@@ -110,11 +108,9 @@ index bdf308a5c55ee..8b496c7e62ef8 100644
 
  	/* Optional switch-wide initialization and destruction methods */
  	int	(*setup)(struct dsa_switch *ds);
-diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
-index 8814fa0e44c84..cf65661686209 100644
 --- a/net/dsa/dsa2.c
 +++ b/net/dsa/dsa2.c
-@@ -248,8 +248,12 @@ static struct dsa_switch_tree *dsa_tree_alloc(int index)
+@@ -230,8 +230,12 @@ static struct dsa_switch_tree *dsa_tree_
 
  static void dsa_tree_free(struct dsa_switch_tree *dst)
  {
@@ -128,16 +124,16 @@ index 8814fa0e44c84..cf65661686209 100644
  	list_del(&dst->list);
  	kfree(dst);
  }
-@@ -822,7 +826,7 @@ static int dsa_switch_setup_tag_protocol(struct dsa_switch *ds)
- 	int err;
+@@ -805,7 +809,7 @@ static int dsa_switch_setup_tag_protocol
+ 	int port, err;
 
  	if (tag_ops->proto == dst->default_proto)
 -		return 0;
 +		goto connect;
 
- 	dsa_switch_for_each_cpu_port(cpu_dp, ds) {
- 		rtnl_lock();
-@@ -836,6 +840,17 @@ static int dsa_switch_setup_tag_protocol(struct dsa_switch *ds)
+ 	for (port = 0; port < ds->num_ports; port++) {
+ 		if (!dsa_is_cpu_port(ds, port))
+@@ -821,6 +825,17 @@ static int dsa_switch_setup_tag_protocol
  		}
  	}
 
@@ -155,7 +151,7 @@ index 8814fa0e44c84..cf65661686209 100644
  	return 0;
  }
 
-@@ -1136,6 +1151,46 @@ static void dsa_tree_teardown(struct dsa_switch_tree *dst)
+@@ -1132,6 +1147,46 @@ static void dsa_tree_teardown(struct dsa
  	dst->setup = false;
  }
 
@@ -202,7 +198,7 @@ index 8814fa0e44c84..cf65661686209 100644
  /* Since the dsa/tagging sysfs device attribute is per master, the assumption
   * is that all DSA switches within a tree share the same tagger, otherwise
   * they would have formed disjoint trees (different "dsa,member" values).
-@@ -1168,12 +1223,15 @@ int dsa_tree_change_tag_proto(struct dsa_switch_tree *dst,
+@@ -1164,12 +1219,15 @@ int dsa_tree_change_tag_proto(struct dsa
  			goto out_unlock;
  	}
 
@@ -220,15 +216,15 @@ index 8814fa0e44c84..cf65661686209 100644
 
  	rtnl_unlock();
 
-@@ -1260,6 +1318,7 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master,
+@@ -1257,6 +1315,7 @@ static int dsa_port_parse_cpu(struct dsa
  	struct dsa_switch_tree *dst = ds->dst;
  	const struct dsa_device_ops *tag_ops;
  	enum dsa_tag_protocol default_proto;
 +	int err;
 
  	/* Find out which protocol the switch would prefer. */
  	default_proto = dsa_get_tag_protocol(dp, master);
-@@ -1307,6 +1366,12 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master,
+@@ -1304,6 +1363,12 @@ static int dsa_port_parse_cpu(struct dsa
  		 */
  		dsa_tag_driver_put(tag_ops);
  	} else {
@@ -241,8 +237,6 @@ index 8814fa0e44c84..cf65661686209 100644
  		dst->tag_ops = tag_ops;
  	}
 
-diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
-index 38ce5129a33dc..0db2b26b0c83c 100644
 --- a/net/dsa/dsa_priv.h
 +++ b/net/dsa/dsa_priv.h
 @@ -37,6 +37,7 @@ enum {
@@ -253,11 +247,9 @@ index 38ce5129a33dc..0db2b26b0c83c 100644
  	DSA_NOTIFIER_MRP_ADD,
  	DSA_NOTIFIER_MRP_DEL,
  	DSA_NOTIFIER_MRP_ADD_RING_ROLE,
-diff --git a/net/dsa/switch.c b/net/dsa/switch.c
-index 9c92edd969612..06948f5368296 100644
 --- a/net/dsa/switch.c
 +++ b/net/dsa/switch.c
-@@ -647,6 +647,17 @@ static int dsa_switch_change_tag_proto(struct dsa_switch *ds,
+@@ -616,6 +616,17 @@ static int dsa_switch_change_tag_proto(s
  	return 0;
  }
 
@@ -275,7 +267,7 @@ index 9c92edd969612..06948f5368296 100644
  static int dsa_switch_mrp_add(struct dsa_switch *ds,
  			      struct dsa_notifier_mrp_info *info)
  {
-@@ -766,6 +777,9 @@ static int dsa_switch_event(struct notifier_block *nb,
+@@ -735,6 +746,9 @@ static int dsa_switch_event(struct notif
  	case DSA_NOTIFIER_TAG_PROTO:
  		err = dsa_switch_change_tag_proto(ds, info);
  		break;
@@ -285,6 +277,3 @@ index 9c92edd969612..06948f5368296 100644
  	case DSA_NOTIFIER_MRP_ADD:
  		err = dsa_switch_mrp_add(ds, info);
  		break;
--- 
-cgit 1.2.3-1.el7
-

target/linux/generic/backport-5.15/701-net-dsa-make-tagging-protocols-connect-to-individual-switches.patch

@@ -65,11 +65,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  net/dsa/tag_sja1105.c      | 67 ++++++++++++++++------------------------------
  6 files changed, 109 insertions(+), 113 deletions(-)
 
-diff --git a/include/net/dsa.h b/include/net/dsa.h
-index 64d71968aa91a..f16959444ae12 100644
 --- a/include/net/dsa.h
 +++ b/include/net/dsa.h
-@@ -82,15 +82,14 @@ enum dsa_tag_protocol {
+@@ -80,15 +80,14 @@ enum dsa_tag_protocol {
  };
 
  struct dsa_switch;
@@ -87,11 +85,9 @@ index 64d71968aa91a..f16959444ae12 100644
  	unsigned int needed_headroom;
  	unsigned int needed_tailroom;
  	const char *name;
-diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
-index cf65661686209..c18b22c0bf55e 100644
 --- a/net/dsa/dsa2.c
 +++ b/net/dsa/dsa2.c
-@@ -248,12 +248,8 @@ static struct dsa_switch_tree *dsa_tree_alloc(int index)
+@@ -230,12 +230,8 @@ static struct dsa_switch_tree *dsa_tree_
 
  static void dsa_tree_free(struct dsa_switch_tree *dst)
  {
@@ -105,7 +101,7 @@ index cf65661686209..c18b22c0bf55e 100644
  	list_del(&dst->list);
  	kfree(dst);
  }
-@@ -841,17 +837,29 @@ static int dsa_switch_setup_tag_protocol(struct dsa_switch *ds)
+@@ -826,17 +822,29 @@ static int dsa_switch_setup_tag_protocol
  	}
 
  connect:
@@ -136,7 +132,7 @@ index cf65661686209..c18b22c0bf55e 100644
  }
 
  static int dsa_switch_setup(struct dsa_switch *ds)
-@@ -1160,13 +1168,6 @@ static int dsa_tree_bind_tag_proto(struct dsa_switch_tree *dst,
+@@ -1156,13 +1164,6 @@ static int dsa_tree_bind_tag_proto(struc
 
  	dst->tag_ops = tag_ops;
 
@@ -150,7 +146,7 @@ index cf65661686209..c18b22c0bf55e 100644
  	/* Notify the switches from this tree about the connection
  	 * to the new tagger
  	 */
-@@ -1176,16 +1177,14 @@ static int dsa_tree_bind_tag_proto(struct dsa_switch_tree *dst,
+@@ -1172,16 +1173,14 @@ static int dsa_tree_bind_tag_proto(struc
  		goto out_disconnect;
 
  	/* Notify the old tagger about the disconnection from this tree */
@@ -171,15 +167,15 @@ index cf65661686209..c18b22c0bf55e 100644
  	dst->tag_ops = old_tag_ops;
 
  	return err;
-@@ -1318,7 +1317,6 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master,
+@@ -1315,7 +1314,6 @@ static int dsa_port_parse_cpu(struct dsa
  	struct dsa_switch_tree *dst = ds->dst;
  	const struct dsa_device_ops *tag_ops;
  	enum dsa_tag_protocol default_proto;
 -	int err;
 
  	/* Find out which protocol the switch would prefer. */
  	default_proto = dsa_get_tag_protocol(dp, master);
-@@ -1366,12 +1364,6 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master,
+@@ -1363,12 +1361,6 @@ static int dsa_port_parse_cpu(struct dsa
  		 */
  		dsa_tag_driver_put(tag_ops);
  	} else {
@@ -192,8 +188,6 @@ index cf65661686209..c18b22c0bf55e 100644
  		dst->tag_ops = tag_ops;
  	}
 
-diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
-index 0db2b26b0c83c..edfaae7b59672 100644
 --- a/net/dsa/dsa_priv.h
 +++ b/net/dsa/dsa_priv.h
 @@ -38,6 +38,7 @@ enum {
@@ -204,11 +198,9 @@ index 0db2b26b0c83c..edfaae7b59672 100644
  	DSA_NOTIFIER_MRP_ADD,
  	DSA_NOTIFIER_MRP_DEL,
  	DSA_NOTIFIER_MRP_ADD_RING_ROLE,
-diff --git a/net/dsa/switch.c b/net/dsa/switch.c
-index 06948f5368296..393f2d8a860a9 100644
 --- a/net/dsa/switch.c
 +++ b/net/dsa/switch.c
-@@ -647,15 +647,58 @@ static int dsa_switch_change_tag_proto(struct dsa_switch *ds,
+@@ -616,15 +616,58 @@ static int dsa_switch_change_tag_proto(s
  	return 0;
  }
 
@@ -270,7 +262,7 @@ index 06948f5368296..393f2d8a860a9 100644
  }
 
  static int dsa_switch_mrp_add(struct dsa_switch *ds,
-@@ -780,6 +823,9 @@ static int dsa_switch_event(struct notifier_block *nb,
+@@ -749,6 +792,9 @@ static int dsa_switch_event(struct notif
  	case DSA_NOTIFIER_TAG_PROTO_CONNECT:
  		err = dsa_switch_connect_tag_proto(ds, info);
  		break;
@@ -280,6 +272,3 @@ index 06948f5368296..393f2d8a860a9 100644
  	case DSA_NOTIFIER_MRP_ADD:
  		err = dsa_switch_mrp_add(ds, info);
  		break;
--- 
-cgit 1.2.3-1.el7
-

target/linux/generic/backport-5.15/742-v5.16-net-phy-at803x-add-support-for-qca-8327-internal-phy.patch

@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
-@@ -1328,6 +1328,19 @@ static struct phy_driver at803x_driver[]
+@@ -1420,6 +1420,19 @@ static struct phy_driver at803x_driver[]
  	.get_sset_count = at803x_get_sset_count,
  	.get_strings = at803x_get_strings,
  	.get_stats = at803x_get_stats,
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }, };
 
  module_phy_driver(at803x_driver);
-@@ -1338,6 +1351,8 @@ static struct mdio_device_id __maybe_unu
+@@ -1430,6 +1443,8 @@ static struct mdio_device_id __maybe_unu
  	{ PHY_ID_MATCH_EXACT(ATH8032_PHY_ID) },
  	{ PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
  	{ PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },