kernel: bump 5.10 to 5.10.184

Manually rebased:
generic/pending-5.10/851-0004-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch

All other patches automatically rebased.

Signed-off-by: Hauke Mehrtens <[email protected]>

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .183
-LINUX_KERNEL_HASH-5.10.183 = 409497c635caf49614de21950ec091eb621a5d5fe1f63fc418ef68ac38b56119
+LINUX_VERSION-5.10 = .184
+LINUX_KERNEL_HASH-5.10.184 = 77a9bebc1d1fa057212a3ac62c2a0784aafcdef149032df8898ebc9ed3c62908

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

@@ -267,7 +267,7 @@
  		case IPV6_2292HOPOPTS:
 --- a/net/ipv6/exthdrs.c
 +++ b/net/ipv6/exthdrs.c
-@@ -948,7 +948,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
+@@ -941,7 +941,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
  		goto drop;
  	}
 

target/linux/bcm27xx/patches-5.10/950-0128-vchiq-Add-36-bit-address-support.patch

@@ -182,7 +182,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  static const char *const ioctl_names[] = {
  	"CONNECT",
  	"SHUTDOWN",
-@@ -2679,6 +2684,7 @@ void vchiq_platform_conn_state_changed(s
+@@ -2681,6 +2686,7 @@ void vchiq_platform_conn_state_changed(s
  static const struct of_device_id vchiq_of_match[] = {
  	{ .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata },
  	{ .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata },

target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch

@@ -22,15 +22,15 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
  static struct vchiq_drvdata bcm2835_drvdata = {
  	.cache_line_size = 32,
-@@ -2765,6 +2766,7 @@ static int vchiq_probe(struct platform_d
+@@ -2767,6 +2768,7 @@ static int vchiq_probe(struct platform_d
  		VCHIQ_VERSION, VCHIQ_VERSION_MIN,
  		MAJOR(vchiq_devid), MINOR(vchiq_devid));
 
 +	vcsm_cma = vchiq_register_child(pdev, "vcsm-cma");
  	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
  	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
 
-@@ -2781,6 +2783,7 @@ static int vchiq_remove(struct platform_
+@@ -2783,6 +2785,7 @@ static int vchiq_remove(struct platform_
  {
  	platform_device_unregister(bcm2835_audio);
  	platform_device_unregister(bcm2835_camera);

target/linux/bcm27xx/patches-5.10/950-0171-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch

@@ -22,15 +22,15 @@ Signed-off-by: Dave Stevenson <[email protected]>
  static struct platform_device *vcsm_cma;
 
  static struct vchiq_drvdata bcm2835_drvdata = {
-@@ -2767,6 +2768,7 @@ static int vchiq_probe(struct platform_d
+@@ -2769,6 +2770,7 @@ static int vchiq_probe(struct platform_d
  		MAJOR(vchiq_devid), MINOR(vchiq_devid));
 
  	vcsm_cma = vchiq_register_child(pdev, "vcsm-cma");
 +	bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
  	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
  	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
 
-@@ -2783,6 +2785,7 @@ static int vchiq_remove(struct platform_
+@@ -2785,6 +2787,7 @@ static int vchiq_remove(struct platform_
  {
  	platform_device_unregister(bcm2835_audio);
  	platform_device_unregister(bcm2835_camera);

target/linux/bcm27xx/patches-5.10/950-0180-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch

@@ -18,7 +18,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -2710,6 +2710,12 @@ vchiq_register_child(struct platform_dev
+@@ -2712,6 +2712,12 @@ vchiq_register_child(struct platform_dev
  		child = NULL;
  	}
 

target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch

@@ -17,15 +17,15 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -2696,6 +2696,7 @@ vchiq_register_child(struct platform_dev
+@@ -2698,6 +2698,7 @@ vchiq_register_child(struct platform_dev
  {
  	struct platform_device_info pdevinfo;
  	struct platform_device *child;
 +	struct device_node *np;
 
  	memset(&pdevinfo, 0, sizeof(pdevinfo));
 
-@@ -2711,10 +2712,20 @@ vchiq_register_child(struct platform_dev
+@@ -2713,10 +2714,20 @@ vchiq_register_child(struct platform_dev
  	}
 
  	/*

target/linux/bcm27xx/patches-5.10/950-0184-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch

@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -2705,12 +2705,20 @@ vchiq_register_child(struct platform_dev
+@@ -2707,12 +2707,20 @@ vchiq_register_child(struct platform_dev
  	pdevinfo.id = PLATFORM_DEVID_NONE;
  	pdevinfo.dma_mask = DMA_BIT_MASK(32);
 

target/linux/bcm27xx/patches-5.10/950-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch

@@ -21,15 +21,15 @@ Signed-off-by: Naushir Patuck <[email protected]>
 
  static struct vchiq_drvdata bcm2835_drvdata = {
  	.cache_line_size = 32,
-@@ -2796,6 +2797,7 @@ static int vchiq_probe(struct platform_d
+@@ -2798,6 +2799,7 @@ static int vchiq_probe(struct platform_d
  	bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
  	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
  	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
 +	bcm2835_isp = vchiq_register_child(pdev, "bcm2835-isp");
 
  	return 0;
 
-@@ -2808,6 +2810,7 @@ failed_platform_init:
+@@ -2810,6 +2812,7 @@ failed_platform_init:
 
  static int vchiq_remove(struct platform_device *pdev)
  {

target/linux/bcm27xx/patches-5.10/950-0253-staging-vchiq_arm-Clean-up-40-bit-DMA-support.patch

@@ -149,7 +149,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -2720,22 +2720,8 @@ vchiq_register_child(struct platform_dev
+@@ -2722,22 +2722,8 @@ vchiq_register_child(struct platform_dev
 
  	child->dev.of_node = np;
 

target/linux/bcm27xx/patches-5.10/950-0298-staging-vchiq_arm-children-inherit-DMA-config.patch

@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -2720,8 +2720,18 @@ vchiq_register_child(struct platform_dev
+@@ -2722,8 +2722,18 @@ vchiq_register_child(struct platform_dev
 
  	child->dev.of_node = np;
 

target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch

@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -6815,15 +6815,10 @@ void __netif_napi_del(struct napi_struct
+@@ -6817,15 +6817,10 @@ void __netif_napi_del(struct napi_struct
  }
  EXPORT_SYMBOL(__netif_napi_del);
 
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	weight = n->weight;
 
  	/* This NAPI_STATE_SCHED test is for avoiding a race
-@@ -6843,7 +6838,7 @@ static int napi_poll(struct napi_struct
+@@ -6845,7 +6840,7 @@ static int napi_poll(struct napi_struct
  			    n->poll, work, weight);
 
  	if (likely(work < weight))
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  	/* Drivers must not modify the NAPI state if they
  	 * consume the entire weight.  In such cases this code
-@@ -6852,7 +6847,7 @@ static int napi_poll(struct napi_struct
+@@ -6854,7 +6849,7 @@ static int napi_poll(struct napi_struct
  	 */
  	if (unlikely(napi_disable_pending(n))) {
  		napi_complete(n);
@@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	}
 
  	if (n->gro_bitmask) {
-@@ -6870,12 +6865,29 @@ static int napi_poll(struct napi_struct
+@@ -6872,12 +6867,29 @@ static int napi_poll(struct napi_struct
  	if (unlikely(!list_empty(&n->poll_list))) {
  		pr_warn_once("%s: Budget exhausted after napi rescheduled\n",
  			     n->dev ? n->dev->name : "backlog");

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

@@ -76,7 +76,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  /**
   *	napi_synchronize - wait until NAPI is not running
-@@ -1865,6 +1855,8 @@ enum netdev_ml_priv_type {
+@@ -1868,6 +1858,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.
-@@ -2184,6 +2176,7 @@ struct net_device {
+@@ -2187,6 +2179,7 @@ struct net_device {
  	struct lock_class_key	*qdisc_running_key;
  	bool			proto_down;
  	unsigned		wol_enabled:1;
@@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	list_add_tail(&napi->poll_list, &sd->poll_list);
  	__raise_softirq_irqoff(NET_RX_SOFTIRQ);
  }
-@@ -6768,6 +6805,12 @@ void netif_napi_add(struct net_device *d
+@@ -6770,6 +6807,12 @@ void netif_napi_add(struct net_device *d
  	set_bit(NAPI_STATE_NPSVC, &napi->state);
  	list_add_rcu(&napi->dev_list, &dev->napi_list);
  	napi_hash_add(napi);
@@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <[email protected]>
  }
  EXPORT_SYMBOL(netif_napi_add);
 
-@@ -6784,9 +6827,28 @@ void napi_disable(struct napi_struct *n)
+@@ -6786,9 +6829,28 @@ void napi_disable(struct napi_struct *n)
  	hrtimer_cancel(&n->timer);
 
  	clear_bit(NAPI_STATE_DISABLE, &n->state);
@@ -195,7 +195,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static void flush_gro_hash(struct napi_struct *napi)
  {
  	int i;
-@@ -6812,6 +6874,11 @@ void __netif_napi_del(struct napi_struct
+@@ -6814,6 +6876,11 @@ void __netif_napi_del(struct napi_struct
 
  	flush_gro_hash(napi);
  	napi->gro_bitmask = 0;
@@ -207,7 +207,7 @@ Signed-off-by: David S. Miller <[email protected]>
  }
  EXPORT_SYMBOL(__netif_napi_del);
 
-@@ -6893,6 +6960,51 @@ static int napi_poll(struct napi_struct
+@@ -6895,6 +6962,51 @@ static int napi_poll(struct napi_struct
  	return work;
  }
 

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

@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		 * wake_up_process() when it's not NULL.
  		 */
  		thread = READ_ONCE(napi->thread);
-@@ -6778,6 +6779,49 @@ static void init_gro_hash(struct napi_st
+@@ -6780,6 +6781,49 @@ static void init_gro_hash(struct napi_st
  	napi->gro_bitmask = 0;
  }
 

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

@@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <[email protected]>
  			wake_up_process(thread);
  			return;
  		}
-@@ -6570,7 +6572,8 @@ bool napi_complete_done(struct napi_stru
+@@ -6572,7 +6574,8 @@ bool napi_complete_done(struct napi_stru
 
  		WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));
 
@@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa <[email protected]>
 
  		/* If STATE_MISSED was set, leave STATE_SCHED set,
  		 * because we will call napi->poll() one more time.
-@@ -7006,16 +7009,25 @@ static int napi_poll(struct napi_struct
+@@ -7008,16 +7011,25 @@ static int napi_poll(struct napi_struct
 
  static int napi_thread_wait(struct napi_struct *napi)
  {

target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch

@@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -7013,7 +7013,7 @@ static int napi_thread_wait(struct napi_
+@@ -7015,7 +7015,7 @@ static int napi_thread_wait(struct napi_
 
  	set_current_state(TASK_INTERRUPTIBLE);
 
@@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  		/* Testing SCHED_THREADED bit here to make sure the current
  		 * kthread owns this napi and could poll on this napi.
  		 * Testing SCHED bit is not enough because SCHED bit might be
-@@ -7031,6 +7031,7 @@ static int napi_thread_wait(struct napi_
+@@ -7033,6 +7033,7 @@ static int napi_thread_wait(struct napi_
  		set_current_state(TASK_INTERRUPTIBLE);
  	}
  	__set_current_state(TASK_RUNNING);

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
-@@ -850,6 +850,27 @@ typedef u16 (*select_queue_fallback_t)(s
+@@ -853,6 +853,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,
-@@ -1296,6 +1317,8 @@ struct netdev_net_notifier {
+@@ -1299,6 +1320,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);
-@@ -1504,6 +1527,8 @@ struct net_device_ops {
+@@ -1507,6 +1530,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]>
  };
 
  /**
-@@ -2851,6 +2876,8 @@ void dev_remove_offload(struct packet_of
+@@ -2854,6 +2879,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
-@@ -852,11 +852,18 @@ typedef u16 (*select_queue_fallback_t)(s
+@@ -855,11 +855,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
-@@ -853,6 +853,7 @@ typedef u16 (*select_queue_fallback_t)(s
+@@ -856,6 +856,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
-@@ -864,10 +864,20 @@ struct net_device_path {
+@@ -867,10 +867,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;
-@@ -877,6 +887,12 @@ struct net_device_path_stack {
+@@ -880,6 +890,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
-@@ -854,6 +854,7 @@ enum net_device_path_type {
+@@ -857,6 +857,7 @@ enum net_device_path_type {
  	DEV_PATH_ETHERNET = 0,
  	DEV_PATH_VLAN,
  	DEV_PATH_BRIDGE,
 +	DEV_PATH_PPPOE,
  };
 
  struct net_device_path {
-@@ -863,6 +864,7 @@ struct net_device_path {
+@@ -866,6 +867,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
-@@ -855,6 +855,7 @@ enum net_device_path_type {
+@@ -858,6 +858,7 @@ enum net_device_path_type {
  	DEV_PATH_VLAN,
  	DEV_PATH_BRIDGE,
  	DEV_PATH_PPPOE,
 +	DEV_PATH_DSA,
  };
 
  struct net_device_path {
-@@ -875,6 +876,10 @@ struct net_device_path {
+@@ -878,6 +879,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
-@@ -872,6 +872,7 @@ struct net_device_path {
+@@ -875,6 +875,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/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch

@@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	- 0 - disabled (default)
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2575,26 +2575,24 @@ int nf_conntrack_init_start(void)
+@@ -2578,26 +2578,24 @@ int nf_conntrack_init_start(void)
  		spin_lock_init(&nf_conntrack_locks[i]);
 
  	if (!nf_conntrack_htable_size) {

target/linux/generic/config-5.10

@@ -660,7 +660,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_TC86C001 is not set
 # CONFIG_BLK_DEV_THROTTLING is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set