Merge remote-tracking branch 'upstream/master' into my-diy

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .175
-LINUX_KERNEL_HASH-5.10.175 = e277562e28f234e36665ae12b7585f9557a83a86bc4a8de8840a305af6307bce
+LINUX_VERSION-5.10 = .176
+LINUX_KERNEL_HASH-5.10.176 = ce072c60ba04173e05b2a1de3fefdeba5ac8b28b1958d92d21bdbf9b736ef793

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .103
-LINUX_KERNEL_HASH-5.15.103 = 0876ba81631cca532f72a8d633f7031c3068669a0ecdd77d23b74e8dfc8dd705
+LINUX_VERSION-5.15 = .104
+LINUX_KERNEL_HASH-5.15.104 = 71c532ce09992e470f3259ffeb38d2b5bba990c243a559e4726a57412bd36b54

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .237
-LINUX_KERNEL_HASH-5.4.237 = b708fee0ff0533cc64a5202287ba5581482e2653925a5d46800edfa525c25527
+LINUX_VERSION-5.4 = .238
+LINUX_KERNEL_HASH-5.4.238 = 70a2b2da85598eba6a73cdc0749e441cbdf3011d9babcb7028a46aa8d98aa91f

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .20
-LINUX_KERNEL_HASH-6.1.20 = 76322de8c01a3c63b42c4d1e9b9e7d1897ddb91276e10d73d1f9df3562f031f0
+LINUX_VERSION-6.1 = .21
+LINUX_KERNEL_HASH-6.1.21 = b33cb1b86ae13441db36f7e8099ff9edb10494bfd141b4efb41bc44bf815d93a

package/kernel/linux/modules/other.mk

@@ -60,7 +60,6 @@ define KernelPackage/bluetooth
 	$(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \
 	$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btusb.ko \
-	$(LINUX_DIR)/drivers/bluetooth/[email protected] \
 	$(LINUX_DIR)/drivers/bluetooth/btqca.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btintel.ko \
 	$(LINUX_DIR)/drivers/bluetooth/[email protected]

target/linux/bcm27xx/patches-5.15/950-0500-net-phy-lan87xx-Allow-more-time-for-link-detect.patch

@@ -21,7 +21,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/net/phy/smsc.c
 +++ b/drivers/net/phy/smsc.c
-@@ -220,12 +220,12 @@ static int lan87xx_read_status(struct ph
+@@ -223,12 +223,12 @@ static int lan87xx_read_status(struct ph
  		if (rc < 0)
  			return rc;
 

target/linux/bcm27xx/patches-5.15/950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch

@@ -18,16 +18,16 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/net/phy/smsc.c
 +++ b/drivers/net/phy/smsc.c
-@@ -210,6 +210,8 @@ static int lan87xx_read_status(struct ph
- 	int err = genphy_read_status(phydev);
+@@ -213,6 +213,8 @@ static int lan87xx_read_status(struct ph
+ 		return err;
 
  	if (!phydev->link && priv->energy_enable && phydev->irq == PHY_POLL) {
 +		int energy_detected;
 +
  		/* Disable EDPD to wake up PHY */
  		int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
  		if (rc < 0)
-@@ -225,7 +227,7 @@ static int lan87xx_read_status(struct ph
+@@ -228,7 +230,7 @@ static int lan87xx_read_status(struct ph
  		 */
  		read_poll_timeout(phy_read, rc,
  				  rc & MII_LAN83C185_ENERGYON || rc < 0,
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  				  MII_LAN83C185_CTRL_STATUS);
  		if (rc < 0)
  			return rc;
-@@ -235,10 +237,16 @@ static int lan87xx_read_status(struct ph
+@@ -238,10 +240,16 @@ static int lan87xx_read_status(struct ph
  		if (rc < 0)
  			return rc;
 

target/linux/generic/backport-5.10/601-v5.12-net-implement-threaded-able-napi-poll-loop-support.patch

@@ -30,31 +30,31 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -354,6 +354,7 @@ struct napi_struct {
+@@ -356,6 +356,7 @@ struct napi_struct {
  	struct list_head	dev_list;
  	struct hlist_node	napi_hash_node;
  	unsigned int		napi_id;
 +	struct task_struct	*thread;
  };
 
  enum {
-@@ -364,6 +365,7 @@ enum {
+@@ -366,6 +367,7 @@ enum {
  	NAPI_STATE_LISTED,	/* NAPI added to system lists */
  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */
  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */
 +	NAPI_STATE_THREADED,		/* The poll is performed inside its own thread*/
  };
 
  enum {
-@@ -374,6 +376,7 @@ enum {
+@@ -376,6 +378,7 @@ enum {
  	NAPIF_STATE_LISTED	 = BIT(NAPI_STATE_LISTED),
  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL),
  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL),
 +	NAPIF_STATE_THREADED	 = BIT(NAPI_STATE_THREADED),
  };
 
  enum gro_result {
-@@ -504,20 +507,7 @@ static inline bool napi_complete(struct
+@@ -506,20 +509,7 @@ static inline bool napi_complete(struct
   */
  void napi_disable(struct napi_struct *n);
 
@@ -76,7 +76,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  /**
   *	napi_synchronize - wait until NAPI is not running
-@@ -1863,6 +1853,8 @@ enum netdev_ml_priv_type {
+@@ -1865,6 +1855,8 @@ enum netdev_ml_priv_type {
   *
   *	@wol_enabled:	Wake-on-LAN is enabled
   *
@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <[email protected]>
   *	@net_notifier_list:	List of per-net netdev notifier block
   *				that follow this device when it is moved
   *				to another network namespace.
-@@ -2182,6 +2174,7 @@ struct net_device {
+@@ -2184,6 +2176,7 @@ struct net_device {
  	struct lock_class_key	*qdisc_running_key;
  	bool			proto_down;
  	unsigned		wol_enabled:1;

target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch

@@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <[email protected]>
 +		== ==================================
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -498,6 +498,8 @@ static inline bool napi_complete(struct
+@@ -500,6 +500,8 @@ static inline bool napi_complete(struct
  	return napi_complete_done(n, 0);
  }
 

target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch

@@ -27,15 +27,15 @@ Cc: Hannes Frederic Sowa <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -366,6 +366,7 @@ enum {
+@@ -368,6 +368,7 @@ enum {
  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */
  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */
  	NAPI_STATE_THREADED,		/* The poll is performed inside its own thread*/
 +	NAPI_STATE_SCHED_THREADED,	/* Napi is currently scheduled in threaded mode */
  };
 
  enum {
-@@ -377,6 +378,7 @@ enum {
+@@ -379,6 +380,7 @@ enum {
  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL),
  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL),
  	NAPIF_STATE_THREADED	 = BIT(NAPI_STATE_THREADED),

target/linux/generic/backport-5.10/610-v5.13-11-net-resolve-forwarding-path-from-virtual-netdevice-a.patch

@@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -848,6 +848,27 @@ typedef u16 (*select_queue_fallback_t)(s
+@@ -850,6 +850,27 @@ typedef u16 (*select_queue_fallback_t)(s
  				       struct sk_buff *skb,
  				       struct net_device *sb_dev);
 
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  enum tc_setup_type {
  	TC_SETUP_QDISC_MQPRIO,
  	TC_SETUP_CLSU32,
-@@ -1294,6 +1315,8 @@ struct netdev_net_notifier {
+@@ -1296,6 +1317,8 @@ struct netdev_net_notifier {
   * struct net_device *(*ndo_get_peer_dev)(struct net_device *dev);
   *	If a device is paired with a peer device, return the peer instance.
   *	The caller must be under RCU read context.
@@ -95,7 +95,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
   */
  struct net_device_ops {
  	int			(*ndo_init)(struct net_device *dev);
-@@ -1502,6 +1525,8 @@ struct net_device_ops {
+@@ -1504,6 +1527,8 @@ struct net_device_ops {
  	int			(*ndo_tunnel_ctl)(struct net_device *dev,
  						  struct ip_tunnel_parm *p, int cmd);
  	struct net_device *	(*ndo_get_peer_dev)(struct net_device *dev);
@@ -104,7 +104,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  };
 
  /**
-@@ -2849,6 +2874,8 @@ void dev_remove_offload(struct packet_of
+@@ -2851,6 +2876,8 @@ void dev_remove_offload(struct packet_of
 
  int dev_get_iflink(const struct net_device *dev);
  int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb);

target/linux/generic/backport-5.10/610-v5.13-12-net-8021q-resolve-forwarding-path-for-vlan-devices.patch

@@ -28,7 +28,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -850,11 +850,18 @@ typedef u16 (*select_queue_fallback_t)(s
+@@ -852,11 +852,18 @@ typedef u16 (*select_queue_fallback_t)(s
 
  enum net_device_path_type {
  	DEV_PATH_ETHERNET = 0,

target/linux/generic/backport-5.10/610-v5.13-13-net-bridge-resolve-forwarding-path-for-bridge-device.patch

@@ -9,7 +9,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -851,6 +851,7 @@ typedef u16 (*select_queue_fallback_t)(s
+@@ -853,6 +853,7 @@ typedef u16 (*select_queue_fallback_t)(s
  enum net_device_path_type {
  	DEV_PATH_ETHERNET = 0,
  	DEV_PATH_VLAN,

target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch

@@ -15,7 +15,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -862,10 +862,20 @@ struct net_device_path {
+@@ -864,10 +864,20 @@ struct net_device_path {
  			u16		id;
  			__be16		proto;
  		} encap;
@@ -36,7 +36,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
  struct net_device_path_stack {
  	int			num_paths;
-@@ -875,6 +885,12 @@ struct net_device_path_stack {
+@@ -877,6 +887,12 @@ struct net_device_path_stack {
  struct net_device_path_ctx {
  	const struct net_device *dev;
  	const u8		*daddr;

target/linux/generic/backport-5.10/610-v5.13-15-net-ppp-resolve-forwarding-path-for-bridge-pppoe-dev.patch

@@ -83,15 +83,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  static int pppoe_recvmsg(struct socket *sock, struct msghdr *m,
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -852,6 +852,7 @@ enum net_device_path_type {
+@@ -854,6 +854,7 @@ enum net_device_path_type {
  	DEV_PATH_ETHERNET = 0,
  	DEV_PATH_VLAN,
  	DEV_PATH_BRIDGE,
 +	DEV_PATH_PPPOE,
  };
 
  struct net_device_path {
-@@ -861,6 +862,7 @@ struct net_device_path {
+@@ -863,6 +864,7 @@ struct net_device_path {
  		struct {
  			u16		id;
  			__be16		proto;

target/linux/generic/backport-5.10/610-v5.13-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch

@@ -10,15 +10,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -853,6 +853,7 @@ enum net_device_path_type {
+@@ -855,6 +855,7 @@ enum net_device_path_type {
  	DEV_PATH_VLAN,
  	DEV_PATH_BRIDGE,
  	DEV_PATH_PPPOE,
 +	DEV_PATH_DSA,
  };
 
  struct net_device_path {
-@@ -873,6 +874,10 @@ struct net_device_path {
+@@ -875,6 +876,10 @@ struct net_device_path {
  			u16		vlan_id;
  			__be16		vlan_proto;
  		} bridge;

target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch

@@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -870,6 +870,7 @@ struct net_device_path {
+@@ -872,6 +872,7 @@ struct net_device_path {
  				DEV_PATH_BR_VLAN_KEEP,
  				DEV_PATH_BR_VLAN_TAG,
  				DEV_PATH_BR_VLAN_UNTAG,

target/linux/generic/backport-5.10/615-v5.14-ip-Treat-IPv4-segment-s-lowest-address-as-unicast.patch

@@ -18,7 +18,7 @@ Link: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit
 
 --- a/net/ipv4/fib_frontend.c
 +++ b/net/ipv4/fib_frontend.c
-@@ -1129,10 +1129,8 @@ void fib_add_ifaddr(struct in_ifaddr *if
+@@ -1132,10 +1132,8 @@ void fib_add_ifaddr(struct in_ifaddr *if
  				  prefix, ifa->ifa_prefixlen, prim,
  				  ifa->ifa_rt_priority);
 

target/linux/generic/backport-5.15/020-v6.1-04-mm-multigenerational-lru-groundwork.patch

@@ -581,7 +581,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
  extern struct list_head cgroup_roots;
 --- a/mm/huge_memory.c
 +++ b/mm/huge_memory.c
-@@ -2364,7 +2364,8 @@ static void __split_huge_page_tail(struc
+@@ -2366,7 +2366,8 @@ static void __split_huge_page_tail(struc
  #ifdef CONFIG_64BIT
  			 (1L << PG_arch_2) |
  #endif

target/linux/generic/backport-5.15/702-v5.19-03-net-ethernet-mtk_eth_soc-implement-flow-offloading-t.patch

@@ -233,15 +233,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static inline void
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -870,6 +870,7 @@ enum net_device_path_type {
+@@ -872,6 +872,7 @@ enum net_device_path_type {
  	DEV_PATH_BRIDGE,
  	DEV_PATH_PPPOE,
  	DEV_PATH_DSA,
 +	DEV_PATH_MTK_WDMA,
  };
 
  struct net_device_path {
-@@ -895,6 +896,12 @@ struct net_device_path {
+@@ -897,6 +898,12 @@ struct net_device_path {
  			int port;
  			u16 proto;
  		} dsa;

target/linux/generic/backport-5.4/901-v6.10-backport-net-device-path.patch

@@ -1,6 +1,6 @@
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -842,6 +842,61 @@ typedef u16 (*select_queue_fallback_t)(s
+@@ -844,6 +844,61 @@ typedef u16 (*select_queue_fallback_t)(s
  				       struct sk_buff *skb,
  				       struct net_device *sb_dev);
 
@@ -62,7 +62,7 @@
  enum tc_setup_type {
  	TC_SETUP_QDISC_MQPRIO,
  	TC_SETUP_CLSU32,
-@@ -1448,6 +1503,8 @@ struct net_device_ops {
+@@ -1450,6 +1505,8 @@ struct net_device_ops {
  						u32 flags);
  	int			(*ndo_xsk_wakeup)(struct net_device *dev,
  						  u32 queue_id, u32 flags);

target/linux/generic/backport-6.1/101-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch

@@ -157,7 +157,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	stats->tx_dropped = tx_drops;
 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
 +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
-@@ -934,7 +934,7 @@ unsigned int aq_ring_fill_stats_data(str
+@@ -948,7 +948,7 @@ unsigned int aq_ring_fill_stats_data(str
  		/* This data should mimic aq_ethtool_queue_rx_stat_names structure */
  		do {
  			count = 0;
@@ -166,7 +166,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  			data[count] = self->stats.rx.packets;
  			data[++count] = self->stats.rx.jumbo_packets;
  			data[++count] = self->stats.rx.lro_packets;
-@@ -951,15 +951,15 @@ unsigned int aq_ring_fill_stats_data(str
+@@ -965,15 +965,15 @@ unsigned int aq_ring_fill_stats_data(str
  			data[++count] = self->stats.rx.xdp_tx;
  			data[++count] = self->stats.rx.xdp_invalid;
  			data[++count] = self->stats.rx.xdp_redirect;
@@ -785,7 +785,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	*data += size;
 --- a/drivers/net/ethernet/intel/ice/ice_main.c
 +++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -6396,10 +6396,10 @@ ice_fetch_u64_stats_per_ring(struct u64_
+@@ -6393,10 +6393,10 @@ ice_fetch_u64_stats_per_ring(struct u64_
  	unsigned int start;
 
  	do {

target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch

@@ -19,23 +19,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1646,6 +1646,7 @@ enum netdev_priv_flags {
+@@ -1648,6 +1648,7 @@ enum netdev_priv_flags {
  	IFF_FAILOVER_SLAVE		= 1<<28,
  	IFF_L3MDEV_RX_HANDLER		= 1<<29,
  	IFF_LIVE_RENAME_OK		= 1<<30,
 +	IFF_NO_IP_ALIGN			= 1<<31,
  };
 
  #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN
-@@ -1678,6 +1679,7 @@ enum netdev_priv_flags {
+@@ -1680,6 +1681,7 @@ enum netdev_priv_flags {
  #define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE
  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER
  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK
 +#define IFF_NO_IP_ALIGN			IFF_NO_IP_ALIGN
 
  /* Specifies the type of the struct net_device::ml_priv pointer */
  enum netdev_ml_priv_type {
-@@ -2018,6 +2020,11 @@ struct net_device {
+@@ -2020,6 +2022,11 @@ struct net_device {
  	const struct tlsdev_ops *tlsdev_ops;
  #endif
 
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	const struct header_ops *header_ops;
 
  	unsigned int		flags;
-@@ -2108,6 +2115,10 @@ struct net_device {
+@@ -2110,6 +2117,10 @@ struct net_device {
  	struct mpls_dev __rcu	*mpls_ptr;
  #endif