kernel: refresh linux 6.1 patches

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

@@ -123,7 +123,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2803,6 +2803,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2804,6 +2804,10 @@ int nf_conntrack_init_net(struct net *ne
  	nf_conntrack_ecache_pernet_init(net);
  	nf_conntrack_proto_pernet_init(net);
  
@@ -299,7 +299,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
-@@ -712,12 +712,19 @@ static size_t ctnetlink_nlmsg_size(const
+@@ -717,12 +717,19 @@ static size_t ctnetlink_nlmsg_size(const
  }
  
  static int
@@ -319,7 +319,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	struct nf_conn *ct = item->ct;
  	struct sk_buff *skb;
  	unsigned int type;
-@@ -3749,11 +3756,17 @@ static int ctnetlink_stat_exp_cpu(struct
+@@ -3750,11 +3757,17 @@ static int ctnetlink_stat_exp_cpu(struct
  }
  
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -337,7 +337,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  
  static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
  	[IPCTNL_MSG_CT_NEW]	= {
-@@ -3852,8 +3865,12 @@ static int __net_init ctnetlink_net_init
+@@ -3853,8 +3866,12 @@ static int __net_init ctnetlink_net_init
  static void ctnetlink_net_pre_exit(struct net *net)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS

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

@@ -1,6 +1,6 @@
 --- a/include/linux/if_bridge.h
 +++ b/include/linux/if_bridge.h
-@@ -69,6 +69,9 @@ void brioctl_set(int (*hook)(struct net
+@@ -71,6 +71,9 @@ void brioctl_set(int (*hook)(struct net
  int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd,
  		  struct ifreq *ifr, void __user *uarg);
  
@@ -12,7 +12,7 @@
  			       struct list_head *br_ip_list);
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -979,6 +979,10 @@ struct sk_buff {
+@@ -986,6 +986,10 @@ struct sk_buff {
  	__u8			csum_not_inet:1;
  	__u8			scm_io_uring:1;
  
@@ -49,7 +49,7 @@
  				   const struct nf_ct_event_notifier *nb);
 --- a/net/Kconfig
 +++ b/net/Kconfig
-@@ -460,6 +460,9 @@ config FAILOVER
+@@ -467,6 +467,9 @@ config FAILOVER
  	  migration of VMs with direct attached VFs by failing over to the
  	  paravirtual datapath when the VF is unplugged.
  
@@ -61,8 +61,8 @@
  	default y
 --- a/net/bridge/br_if.c
 +++ b/net/bridge/br_if.c
-@@ -774,6 +774,28 @@ void br_port_flags_change(struct net_bri
+@@ -767,6 +767,28 @@ void br_port_flags_change(struct net_bri
- 		br_recalculate_neigh_suppress_enabled(br);
+ 		br_offload_port_state(p);
  }
  
 +void br_dev_update_stats(struct net_device *dev,
@@ -109,9 +109,9 @@
 +	}
 +#endif
  
- 	len = skb->len;
+ #ifdef CONFIG_ETHERNET_PACKET_MANGLE
- 	trace_net_dev_start_xmit(skb, dev);
+ 	if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
-@@ -5237,6 +5245,11 @@ void netdev_rx_handler_unregister(struct
+@@ -5242,6 +5250,11 @@ void netdev_rx_handler_unregister(struct
  }
  EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
  
@@ -123,7 +123,7 @@
  /*
   * Limit the use of PFMEMALLOC reserves to those protocols that implement
   * the special handling of PFMEMALLOC skbs.
-@@ -5285,6 +5298,10 @@ static int __netif_receive_skb_core(stru
+@@ -5290,6 +5303,10 @@ static int __netif_receive_skb_core(stru
  	int ret = NET_RX_DROP;
  	__be16 type;
  
@@ -134,7 +134,7 @@
  	net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
  
  	trace_netif_receive_skb(skb);
-@@ -5322,6 +5339,15 @@ another_round:
+@@ -5327,6 +5344,15 @@ another_round:
  			goto out;
  	}
  

target/linux/rockchip/patches-6.1/106-rockchip-rock-pi-4.patch

@@ -9,7 +9,7 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
-@@ -50,6 +52,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pu
+@@ -50,6 +52,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ro
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-4c-plus.dtb

target/linux/rockchip/patches-6.1/210-rockchip-rk356x-add-support-for-new-boards.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -71,3 +71,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-so
+@@ -79,3 +79,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-so
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-bpi-r2-pro.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb

target/linux/rockchip/patches-6.1/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch

@@ -51,7 +51,7 @@ Signed-off-by: wevsty <ty@wevs.org>
 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
 @@ -211,6 +211,16 @@
- 		status = "okay";
+ 		};
  	};
  
 +	rng: rng@fe388000 {

target/linux/rockchip/patches-6.1/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch

@@ -179,7 +179,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
  	GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED,
 --- a/drivers/clk/rockchip/clk.h
 +++ b/drivers/clk/rockchip/clk.h
-@@ -399,7 +399,8 @@ struct clk *rockchip_clk_register_mmc(co
+@@ -418,7 +418,8 @@ struct clk *rockchip_clk_register_mmc(co
   * DDRCLK flags, including method of setting the rate
   * ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate.
   */