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

* https://github.com/coolsnowwolf/lede: luci-app-mosdns: move to feeds kernel: add WED rx support for mediatek on mt76 with MT7986 and MT7915 pacakge: add mosdns and luci-app-mosdns from sbwml kernel: bump 5.15 to 5.15.80 (coolsnowwolf#10506) kernel: bump 6.0 to 6.0.10 (coolsnowwolf#10505) kernel: bump 5.10 to 5.10.156 (coolsnowwolf#10498) kernel: bump 5.4 to 5.4.225 tools/mpfr: update to 4.1.1 (coolsnowwolf#10502) Update feeds.conf.default
Dts725 · Nov 26, 2022 · 8ab599f · 8ab599f
2 parents 660989d + f235862
commit 8ab599f
Show file tree

Hide file tree

Showing 66 changed files with 4,929 additions and 150 deletions.
diff --git a/feeds.conf.default b/feeds.conf.default
@@ -2,7 +2,8 @@ src-git packages https://github.com/coolsnowwolf/packages
 src-git luci https://github.com/coolsnowwolf/luci
 src-git routing https://github.com/coolsnowwolf/routing
 src-git telephony https://git.openwrt.org/feed/telephony.git
-src-git oui https://github.com/zhaojh329/oui.git
+#src-git helloworld https://github.com/fw876/helloworld.git
+#src-git oui https://github.com/zhaojh329/oui.git
 #src-git video https://github.com/openwrt/video.git
 #src-git targets https://github.com/openwrt/targets.git
 #src-git oldpackages http://git.openwrt.org/packages.git

diff --git a/include/kernel-5.10 b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .155
-LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3
+LINUX_VERSION-5.10 = .156
+LINUX_KERNEL_HASH-5.10.156 = 679e9964ca720027967391b61db990ceb7868e93e203f87724f18310f4955923
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .79
-LINUX_KERNEL_HASH-5.15.79 = cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154
+LINUX_VERSION-5.15 = .80
+LINUX_KERNEL_HASH-5.15.80 = 3b321a6466d2021f60ed8d4e33bba21db2f23efc2ddd2d9fb775393d9afdfd4d
diff --git a/include/kernel-5.4 b/include/kernel-5.4
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .224
-LINUX_KERNEL_HASH-5.4.224 = 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36
+LINUX_VERSION-5.4 = .225
+LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa
diff --git a/include/kernel-6.0 b/include/kernel-6.0
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.0 = .9
-LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7
+LINUX_VERSION-6.0 = .10
+LINUX_KERNEL_HASH-6.0.10 = 39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0
diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
@@ -1,3 +1,47 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] ar71xx: fix unaligned access in a few more places
+
+SVN-Revision: 35130
+---
+ arch/mips/include/asm/checksum.h              | 83 +++---------------
+ include/uapi/linux/ip.h                       |  2 +-
+ include/uapi/linux/ipv6.h                     |  2 +-
+ include/uapi/linux/tcp.h                      |  4 ++--
+ include/uapi/linux/udp.h                      |  2 +-
+ net/netfilter/nf_conntrack_core.c             |  4 ++--
+ include/uapi/linux/icmp.h                     |  2 +-
+ include/uapi/linux/in6.h                      |  2 +-
+ net/ipv6/tcp_ipv6.c                           |  9 +++--
+ net/ipv6/datagram.c                           |  6 ++--
+ net/ipv6/exthdrs.c                            |  2 +-
+ include/linux/types.h                         |  5 +++
+ net/ipv4/af_inet.c                            |  4 ++--
+ net/ipv4/tcp_output.c                         | 69 +++++++++--------
+ include/uapi/linux/igmp.h                     |  8 +++---
+ net/core/flow_dissector.c                     |  2 +-
+ include/uapi/linux/icmpv6.h                   |  2 +-
+ include/net/ndisc.h                           | 10 ++++----
+ net/sched/cls_u32.c                           |  6 +++---
+ net/ipv6/ip6_offload.c                        |  2 +-
+ include/net/addrconf.h                        |  2 +-
+ include/net/inet_ecn.h                        |  4 ++--
+ include/net/ipv6.h                            | 23 +++++----
+ include/net/secure_seq.h                      |  1 +
+ include/uapi/linux/in.h                       |  2 +-
+ net/ipv6/ip6_fib.h                            |  2 +-
+ net/netfilter/nf_conntrack_proto_tcp.c        |  2 +-
+ net/xfrm/xfrm_input.c                         |  4 ++--
+ net/ipv4/tcp_input.c                          | 12 ++++---
+ include/uapi/linux/if_pppox.h                 |  1 +
+ net/ipv6/netfilter/nf_log_ipv6.c              |  4 ++--
+ include/net/neighbour.h                       |  6 +++--
+ include/uapi/linux/netfilter_arp/arp_tables.h |  2 +-
+ net/core/utils.c                              | 10 +++++--
+ include/linux/etherdevice.h                   | 11 ++++---
+ net/ipv4/tcp_offload.c                        |  6 +++---
+ net/ipv6/netfilter/ip6table_mangle.c          |  4 ++--
+ 37 file changed, 171 insertions(+), 141 deletions(-)
+
 --- a/arch/mips/include/asm/checksum.h
 +++ b/arch/mips/include/asm/checksum.h
 @@ -100,26 +100,30 @@ static inline __sum16 ip_fast_csum(const
@@ -118,9 +162,9 @@
 
 --- a/include/uapi/linux/ip.h
 +++ b/include/uapi/linux/ip.h
-@@ -103,7 +103,7 @@ struct iphdr {
- 	__be32	saddr;
- 	__be32	daddr;
+@@ -105,7 +105,7 @@ struct iphdr {
+ 		__be32	daddr;
+ 	);
  	/*The options start here. */
 -};
 +} __attribute__((packed, aligned(2)));
@@ -129,10 +173,10 @@
  struct ip_auth_hdr {
 --- a/include/uapi/linux/ipv6.h
 +++ b/include/uapi/linux/ipv6.h
-@@ -132,7 +132,7 @@ struct ipv6hdr {
-
- 	struct	in6_addr	saddr;
- 	struct	in6_addr	daddr;
+@@ -134,7 +134,7 @@ struct ipv6hdr {
+ 		struct	in6_addr	saddr;
+ 		struct	in6_addr	daddr;
+ 	);
 -};
 +} __attribute__((packed, aligned(2)));
 
@@ -229,16 +273,6 @@
  	}
 
  #ifdef CONFIG_TCP_MD5SIG
---- a/include/linux/ipv6.h
-+++ b/include/linux/ipv6.h
-@@ -6,6 +6,7 @@
-
- #define ipv6_optlen(p)  (((p)->hdrlen+1) << 3)
- #define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
-+
- /*
-  * This structure contains configuration options per IPv6 link.
-  */
 --- a/net/ipv6/datagram.c
 +++ b/net/ipv6/datagram.c
 @@ -492,7 +492,7 @@ int ipv6_recv_error(struct sock *sk, str

diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
@@ -1,3 +1,47 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Subject: [PATCH] ar71xx: fix unaligned access in a few more places
+
+SVN-Revision: 35130
+---
+ arch/mips/include/asm/checksum.h              | 83 +++---------------
+ include/uapi/linux/ip.h                       |  2 +-
+ include/uapi/linux/ipv6.h                     |  2 +-
+ include/uapi/linux/tcp.h                      |  4 ++--
+ include/uapi/linux/udp.h                      |  2 +-
+ net/netfilter/nf_conntrack_core.c             |  4 ++--
+ include/uapi/linux/icmp.h                     |  2 +-
+ include/uapi/linux/in6.h                      |  2 +-
+ net/ipv6/tcp_ipv6.c                           |  9 +++--
+ net/ipv6/datagram.c                           |  6 ++--
+ net/ipv6/exthdrs.c                            |  2 +-
+ include/linux/types.h                         |  5 +++
+ net/ipv4/af_inet.c                            |  4 ++--
+ net/ipv4/tcp_output.c                         | 69 +++++++++--------
+ include/uapi/linux/igmp.h                     |  8 +++---
+ net/core/flow_dissector.c                     |  2 +-
+ include/uapi/linux/icmpv6.h                   |  2 +-
+ include/net/ndisc.h                           | 10 ++++----
+ net/sched/cls_u32.c                           |  6 +++---
+ net/ipv6/ip6_offload.c                        |  2 +-
+ include/net/addrconf.h                        |  2 +-
+ include/net/inet_ecn.h                        |  4 ++--
+ include/net/ipv6.h                            | 23 +++++----
+ include/net/secure_seq.h                      |  1 +
+ include/uapi/linux/in.h                       |  2 +-
+ net/ipv6/ip6_fib.h                            |  2 +-
+ net/netfilter/nf_conntrack_proto_tcp.c        |  2 +-
+ net/xfrm/xfrm_input.c                         |  4 ++--
+ net/ipv4/tcp_input.c                          | 12 ++++---
+ include/uapi/linux/if_pppox.h                 |  1 +
+ net/ipv6/netfilter/nf_log_ipv6.c              |  4 ++--
+ include/net/neighbour.h                       |  6 +++--
+ include/uapi/linux/netfilter_arp/arp_tables.h |  2 +-
+ net/core/utils.c                              | 10 +++++--
+ include/linux/etherdevice.h                   | 11 ++++---
+ net/ipv4/tcp_offload.c                        |  6 +++---
+ net/ipv6/netfilter/ip6table_mangle.c          |  4 ++--
+ 37 file changed, 171 insertions(+), 141 deletions(-)
+
 --- a/arch/mips/include/asm/checksum.h
 +++ b/arch/mips/include/asm/checksum.h
 @@ -100,26 +100,30 @@ static inline __sum16 ip_fast_csum(const
@@ -118,9 +162,9 @@
 
 --- a/include/uapi/linux/ip.h
 +++ b/include/uapi/linux/ip.h
-@@ -103,7 +103,7 @@ struct iphdr {
- 	__be32	saddr;
- 	__be32	daddr;
+@@ -105,7 +105,7 @@ struct iphdr {
+ 		__be32	daddr;
+ 	);
  	/*The options start here. */
 -};
 +} __attribute__((packed, aligned(2)));
@@ -129,10 +173,10 @@
  struct ip_auth_hdr {
 --- a/include/uapi/linux/ipv6.h
 +++ b/include/uapi/linux/ipv6.h
-@@ -132,7 +132,7 @@ struct ipv6hdr {
-
- 	struct	in6_addr	saddr;
- 	struct	in6_addr	daddr;
+@@ -134,7 +134,7 @@ struct ipv6hdr {
+ 		struct	in6_addr	saddr;
+ 		struct	in6_addr	daddr;
+ 	);
 -};
 +} __attribute__((packed, aligned(2)));
 

diff --git a/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
@@ -291,7 +291,7 @@ bcm2835-mmc: uninitialized_var is no more
  		goto out;
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
-@@ -1801,7 +1801,8 @@ EXPORT_SYMBOL(mmc_erase);
+@@ -1807,7 +1807,8 @@ EXPORT_SYMBOL(mmc_erase);
 
  int mmc_can_erase(struct mmc_card *card)
  {

diff --git a/...x/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch b/...x/bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
@@ -157,7 +157,7 @@ Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
  static const struct drm_display_mode innolux_at070tn92_mode = {
  	.clock = 33333,
  	.hdisplay = 800,
-@@ -4660,6 +4692,9 @@ static const struct of_device_id platfor
+@@ -4662,6 +4694,9 @@ static const struct of_device_id platfor
  		.compatible = "innolux,at043tn24",
  		.data = &innolux_at043tn24,
  	}, {

diff --git a/.../bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/.../bcm27xx/patches-5.15/950-0479-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3759,6 +3759,31 @@ static const struct panel_desc qishenglo
+@@ -3761,6 +3761,31 @@ static const struct panel_desc qishenglo
  	.connector_type = DRM_MODE_CONNECTOR_DPI,
  };
 
@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  static const struct display_timing rocktech_rk070er9427_timing = {
  	.pixelclock = { 26400000, 33300000, 46800000 },
  	.hactive = { 800, 800, 800 },
-@@ -4839,6 +4864,9 @@ static const struct of_device_id platfor
+@@ -4841,6 +4866,9 @@ static const struct of_device_id platfor
  		.compatible = "qishenglong,gopher2b-lcd",
  		.data = &qishenglong_gopher2b_lcd,
  	}, {

diff --git a/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-5.15/950-0686-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
  static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
  	.clock = 9000,
  	.hdisplay = 480,
-@@ -4702,6 +4728,9 @@ static const struct of_device_id platfor
+@@ -4704,6 +4730,9 @@ static const struct of_device_id platfor
  		.compatible = "friendlyarm,hd702e",
  		.data = &friendlyarm_hd702e,
  	}, {

diff --git a/...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@ -311,15 +311,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	arc_emac_set_address_internal(ndev);
 --- a/drivers/net/ethernet/atheros/ag71xx.c
 +++ b/drivers/net/ethernet/atheros/ag71xx.c
-@@ -1856,7 +1856,6 @@ static int ag71xx_probe(struct platform_
+@@ -1857,7 +1857,6 @@ static int ag71xx_probe(struct platform_
  	const struct ag71xx_dcfg *dcfg;
  	struct net_device *ndev;
  	struct resource *res;
 -	const void *mac_addr;
  	int tx_size, err, i;
  	struct ag71xx *ag;
 
-@@ -1952,10 +1951,8 @@ static int ag71xx_probe(struct platform_
+@@ -1953,10 +1952,8 @@ static int ag71xx_probe(struct platform_
  	ag->stop_desc->ctrl = 0;
  	ag->stop_desc->next = (u32)ag->stop_desc_dma;
 

diff --git a/...nux/generic/backport-5.15/703-03-v5.16-net-dsa-populate-supported_interfaces-member.patch b/...nux/generic/backport-5.15/703-03-v5.16-net-dsa-populate-supported_interfaces-member.patch
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  				    struct phylink_link_state *state);
 --- a/net/dsa/port.c
 +++ b/net/dsa/port.c
-@@ -1172,6 +1172,10 @@ static int dsa_port_phylink_register(str
+@@ -1188,6 +1188,10 @@ static int dsa_port_phylink_register(str
  	dp->pl_config.type = PHYLINK_DEV;
  	dp->pl_config.pcs_poll = ds->pcs_poll;
 

diff --git a/target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch b/target/linux/generic/backport-5.15/703-04-v5.17-net-dsa-consolidate-phylink-creation.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/net/dsa/dsa_priv.h
 +++ b/net/dsa/dsa_priv.h
-@@ -260,13 +260,13 @@ int dsa_port_mrp_add_ring_role(const str
+@@ -261,13 +261,13 @@ int dsa_port_mrp_add_ring_role(const str
  			       const struct switchdev_obj_ring_role_mrp *mrp);
  int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,
  			       const struct switchdev_obj_ring_role_mrp *mrp);
@@ -38,7 +38,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  						 const struct net_device *dev)
 --- a/net/dsa/port.c
 +++ b/net/dsa/port.c
-@@ -1076,7 +1076,7 @@ static void dsa_port_phylink_mac_link_up
+@@ -1092,7 +1092,7 @@ static void dsa_port_phylink_mac_link_up
  				     speed, duplex, tx_pause, rx_pause);
  }
 
@@ -47,7 +47,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  	.validate = dsa_port_phylink_validate,
  	.mac_pcs_get_state = dsa_port_phylink_mac_pcs_get_state,
  	.mac_config = dsa_port_phylink_mac_config,
-@@ -1085,6 +1085,30 @@ const struct phylink_mac_ops dsa_port_ph
+@@ -1101,6 +1101,30 @@ const struct phylink_mac_ops dsa_port_ph
  	.mac_link_up = dsa_port_phylink_mac_link_up,
  };
 
@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)
  {
  	struct dsa_switch *ds = dp->ds;
-@@ -1161,27 +1185,15 @@ static int dsa_port_phylink_register(str
+@@ -1177,27 +1201,15 @@ static int dsa_port_phylink_register(str
  {
  	struct dsa_switch *ds = dp->ds;
  	struct device_node *port_dn = dp->dn;

diff --git a/...ric/backport-5.15/703-05-v5.17-net-dsa-replace-phylink_get_interfaces-with-phylink_.patch b/...ric/backport-5.15/703-05-v5.17-net-dsa-replace-phylink_get_interfaces-with-phylink_.patch
@@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  				    struct phylink_link_state *state);
 --- a/net/dsa/port.c
 +++ b/net/dsa/port.c
-@@ -1095,9 +1095,8 @@ int dsa_port_phylink_create(struct dsa_p
+@@ -1111,9 +1111,8 @@ int dsa_port_phylink_create(struct dsa_p
  	if (err)
  		mode = PHY_INTERFACE_MODE_NA;
 

diff --git a/...x/generic/backport-5.15/703-06-v5.18-net-dsa-add-support-for-phylink-mac_select_pcs.patch b/...x/generic/backport-5.15/703-06-v5.18-net-dsa-add-support-for-phylink-mac_select_pcs.patch
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	void	(*phylink_mac_config)(struct dsa_switch *ds, int port,
 --- a/net/dsa/port.c
 +++ b/net/dsa/port.c
-@@ -1012,6 +1012,20 @@ static void dsa_port_phylink_mac_pcs_get
+@@ -1028,6 +1028,20 @@ static void dsa_port_phylink_mac_pcs_get
  	}
  }
 
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void dsa_port_phylink_mac_config(struct phylink_config *config,
  					unsigned int mode,
  					const struct phylink_link_state *state)
-@@ -1078,6 +1092,7 @@ static void dsa_port_phylink_mac_link_up
+@@ -1094,6 +1108,7 @@ static void dsa_port_phylink_mac_link_up
 
  static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {
  	.validate = dsa_port_phylink_validate,

diff --git a/...generic/backport-5.15/703-13-v5.17-net-dsa-mark-DSA-phylink-as-legacy_pre_march2020.patch b/...generic/backport-5.15/703-13-v5.17-net-dsa-mark-DSA-phylink-as-legacy_pre_march2020.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/net/dsa/port.c
 +++ b/net/dsa/port.c
-@@ -1110,6 +1110,13 @@ int dsa_port_phylink_create(struct dsa_p
+@@ -1126,6 +1126,13 @@ int dsa_port_phylink_create(struct dsa_p
  	if (err)
  		mode = PHY_INTERFACE_MODE_NA;
 

diff --git a/...eric/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch b/...eric/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch
@@ -76,7 +76,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  	if (iface == PHY_INTERFACE_MODE_MOCA)
 --- a/net/dsa/port.c
 +++ b/net/dsa/port.c
-@@ -1017,8 +1017,8 @@ dsa_port_phylink_mac_select_pcs(struct p
+@@ -1033,8 +1033,8 @@ dsa_port_phylink_mac_select_pcs(struct p
  				phy_interface_t interface)
  {
  	struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);

diff --git a/.../backport-5.15/765-v5.17-03-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch b/.../backport-5.15/765-v5.17-03-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/net/dsa/master.c
 +++ b/net/dsa/master.c
-@@ -330,28 +330,13 @@ static const struct attribute_group dsa_
+@@ -329,28 +329,13 @@ static const struct attribute_group dsa_
  	.attrs	= dsa_slave_attrs,
  };
 
@@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
  	/* The DSA master must use SET_NETDEV_DEV for this to work. */
  	consumer_link = device_link_add(ds->dev, dev->dev.parent,
-@@ -361,13 +346,6 @@ int dsa_master_setup(struct net_device *
+@@ -360,13 +345,6 @@ int dsa_master_setup(struct net_device *
  			   "Failed to create a device link to DSA switch %s\n",
  			   dev_name(ds->dev));
 
@@ -81,7 +81,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	/* If we use a tagging format that doesn't have an ethertype
  	 * field, make sure that all packets from this point on get
  	 * sent to the tag format's receive function.
-@@ -405,7 +383,6 @@ void dsa_master_teardown(struct net_devi
+@@ -404,7 +382,6 @@ void dsa_master_teardown(struct net_devi
  	sysfs_remove_group(&dev->dev.kobj, &dsa_group);
  	dsa_netdev_ops_set(dev, NULL);
  	dsa_master_ethtool_teardown(dev);

diff --git a/...ort-5.15/765-v5.17-04-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch b/...ort-5.15/765-v5.17-04-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch
@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int dsa_tree_setup_lags(struct dsa_switch_tree *dst)
 --- a/net/dsa/master.c
 +++ b/net/dsa/master.c
-@@ -267,9 +267,9 @@ static void dsa_master_set_promiscuity(s
+@@ -266,9 +266,9 @@ static void dsa_master_set_promiscuity(s
  	if (!ops->promisc_on_master)
  		return;
 

diff --git a/...ric/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch b/...ric/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
@@ -160,7 +160,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  struct dsa_switchdev_event_work {
  	struct dsa_switch *ds;
  	int port;
-@@ -548,6 +555,12 @@ int dsa_tree_change_tag_proto(struct dsa
+@@ -549,6 +556,12 @@ int dsa_tree_change_tag_proto(struct dsa
  			      struct net_device *master,
  			      const struct dsa_device_ops *tag_ops,
  			      const struct dsa_device_ops *old_tag_ops);