kernel: refresh 6.12 patches (#13178)

target/linux/generic/hack-6.12/253-ksmbd-config.patch

@@ -1,6 +1,6 @@
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -2030,7 +2030,7 @@ config PADATA
+@@ -2043,7 +2043,7 @@ config PADATA
  	bool
 
  config ASN1

target/linux/generic/hack-6.12/410-block-fit-partition-parser.patch

@@ -1,6 +1,6 @@
 --- a/block/blk.h
 +++ b/block/blk.h
-@@ -558,6 +558,8 @@ void blk_free_ext_minor(unsigned int min
+@@ -564,6 +564,8 @@ void blk_free_ext_minor(unsigned int min
  #define ADDPART_FLAG_NONE	0
  #define ADDPART_FLAG_RAID	1
  #define ADDPART_FLAG_WHOLEDISK	2

target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch

@@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -712,8 +712,6 @@ config NFT_REJECT_NETDEV
+@@ -715,8 +715,6 @@ config NFT_REJECT_NETDEV
 
  endif # NF_TABLES_NETDEV
 
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  config NF_FLOW_TABLE_INET
  	tristate "Netfilter flow table mixed IPv4/IPv6 module"
  	depends on NF_FLOW_TABLE
-@@ -722,11 +720,12 @@ config NF_FLOW_TABLE_INET
+@@ -725,11 +723,12 @@ config NF_FLOW_TABLE_INET
 
  	  To compile it as a module, choose M here.
 

target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1082,6 +1082,7 @@ static const struct usb_device_id produc
+@@ -1083,6 +1083,7 @@ static const struct usb_device_id produc
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},	/* Quectel EM160R-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},	/* Quectel RM500Q-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},	/* Quectel RM520N */
@@ -19,7 +19,7 @@
 
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1199,6 +1201,11 @@ static const struct usb_device_id option
+@@ -1201,6 +1203,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

target/linux/generic/hack-6.12/902-debloat_proc.patch

@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!pe)
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -2192,10 +2192,12 @@ void __init init_mm_internals(void)
+@@ -2194,10 +2194,12 @@ void __init init_mm_internals(void)
  	start_shepherd_timer();
  #endif
  #ifdef CONFIG_PROC_FS
@@ -319,7 +319,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4223,6 +4223,8 @@ static __net_initdata struct pernet_oper
+@@ -4229,6 +4229,8 @@ static __net_initdata struct pernet_oper
 
  static int __init proto_init(void)
  {

target/linux/generic/hack-6.12/904-debloat_dma_buf.patch

@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +dma-shared-buffer-objs :=  $(dma-buf-objs-y)
 --- a/drivers/dma-buf/dma-buf.c
 +++ b/drivers/dma-buf/dma-buf.c
-@@ -1731,4 +1731,5 @@ static void __exit dma_buf_deinit(void)
+@@ -1743,4 +1743,5 @@ static void __exit dma_buf_deinit(void)
  	kern_unmount(dma_buf_mnt);
  	dma_buf_uninit_sysfs_statistics();
  }
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4487,6 +4487,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4419,6 +4419,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }

target/linux/generic/hack-6.12/920-device_tree_cmdline.patch

@@ -1,6 +1,6 @@
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1051,6 +1051,9 @@ int __init early_init_dt_scan_chosen(cha
+@@ -1052,6 +1052,9 @@ int __init early_init_dt_scan_chosen(cha
  	p = of_get_flat_dt_prop(node, "bootargs", &l);
  	if (p != NULL && l > 0)
  		strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));

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

@@ -123,7 +123,7 @@ Signed-off-by: Zhi Chen <[email protected]>
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2801,6 +2801,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2750,6 +2750,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 <[email protected]>
  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
-@@ -723,12 +723,19 @@ static size_t ctnetlink_nlmsg_size(const
+@@ -721,12 +721,19 @@ static size_t ctnetlink_nlmsg_size(const
  }
 
  static int
@@ -319,7 +319,7 @@ Signed-off-by: Zhi Chen <[email protected]>
  	struct nf_conn *ct = item->ct;
  	struct sk_buff *skb;
  	unsigned int type;
-@@ -3750,11 +3757,17 @@ static int ctnetlink_stat_exp_cpu(struct
+@@ -3754,11 +3761,17 @@ static int ctnetlink_stat_exp_cpu(struct
  }
 
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -337,7 +337,7 @@ Signed-off-by: Zhi Chen <[email protected]>
 
  static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
  	[IPCTNL_MSG_CT_NEW]	= {
-@@ -3853,8 +3866,12 @@ static int __net_init ctnetlink_net_init
+@@ -3857,8 +3870,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.12/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
-@@ -72,6 +72,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
-@@ -1011,6 +1011,9 @@
+@@ -1011,6 +1011,9 @@ struct sk_buff {
  	__u8			csum_not_inet:1;
  #endif
  	__u8			unreadable:1;
@@ -35,7 +35,7 @@
  				   const struct nf_ct_event_notifier *nb);
 --- a/net/Kconfig
 +++ b/net/Kconfig
-@@ -504,6 +504,9 @@ config FAILOVER
+@@ -512,6 +512,9 @@ config FAILOVER
  	  migration of VMs with direct attached VFs by failing over to the
  	  paravirtual datapath when the VF is unplugged.
 
@@ -44,7 +44,7 @@
 +
  config ETHTOOL_NETLINK
  	bool "Netlink interface for ethtool"
- 	default y
+ 	select DIMLIB
 --- a/net/bridge/br_if.c
 +++ b/net/bridge/br_if.c
 @@ -764,6 +764,28 @@ void br_port_flags_change(struct net_bri
@@ -78,7 +78,7 @@
  	struct net_bridge_port *p;
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -3567,9 +3567,17 @@ static int xmit_one(struct sk_buff *skb,
+@@ -3579,9 +3579,17 @@ static int xmit_one(struct sk_buff *skb,
  {
  	unsigned int len;
  	int rc;
@@ -95,9 +95,9 @@
 +	}
 +#endif
 
- #ifdef CONFIG_ETHERNET_PACKET_MANGLE
- 	if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
-@@ -5308,6 +5316,11 @@ void netdev_rx_handler_unregister(struct
+ 	len = skb->len;
+ 	trace_net_dev_start_xmit(skb, dev);
+@@ -5417,6 +5425,11 @@ void netdev_rx_handler_unregister(struct
  }
  EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
 
@@ -109,7 +109,7 @@
  /*
   * Limit the use of PFMEMALLOC reserves to those protocols that implement
   * the special handling of PFMEMALLOC skbs.
-@@ -5356,6 +5369,10 @@ static int __netif_receive_skb_core(stru
+@@ -5465,6 +5478,10 @@ static int __netif_receive_skb_core(stru
  	int ret = NET_RX_DROP;
  	__be16 type;
 
@@ -120,7 +120,7 @@
  	net_timestamp_check(!READ_ONCE(net_hotdata.tstamp_prequeue), skb);
 
  	trace_netif_receive_skb(skb);
-@@ -5393,6 +5410,15 @@ another_round:
+@@ -5503,6 +5520,15 @@ another_round:
  			goto out;
  	}
 

target/linux/generic/hack-6.12/992-add-ndo-do-ioctl.patch

@@ -1,6 +1,6 @@
 --- a/net/wireless/wext-core.c
 +++ b/net/wireless/wext-core.c
-@@ -981,6 +981,9 @@ static int wireless_process_ioctl(struct
+@@ -984,6 +984,9 @@ static int wireless_process_ioctl(struct
  		else if (private)
  			return private(dev, iwr, cmd, info, handler);
  	}

target/linux/generic/hack-6.12/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch

@@ -25,7 +25,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	const u8 cmd = info->genlhdr->cmd;
  	int err;
 
-@@ -1396,9 +1396,8 @@ static void drbd_suspend_al(struct drbd_
+@@ -1388,9 +1388,8 @@ static void drbd_suspend_al(struct drbd_
 
  static bool should_set_defaults(struct genl_info *info)
  {
@@ -37,7 +37,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  }
 
  static unsigned int drbd_al_extents_max(struct drbd_backing_dev *bdev)
-@@ -4277,7 +4276,7 @@ static void device_to_info(struct device
+@@ -4268,7 +4267,7 @@ static void device_to_info(struct device
  int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info)
  {
  	struct drbd_config_context adm_ctx;
@@ -48,23 +48,23 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	retcode = drbd_adm_prepare(&adm_ctx, skb, info, DRBD_ADM_NEED_RESOURCE);
 --- a/include/net/genetlink.h
 +++ b/include/net/genetlink.h
-@@ -98,6 +98,7 @@ struct genl_family {
+@@ -122,6 +122,7 @@ struct genl_family {
   * @family: generic netlink family
   * @nlhdr: netlink message header
   * @genlhdr: generic netlink message header
 + * @userhdr: user specific header
   * @attrs: netlink attributes
   * @_net: network namespace
   * @user_ptr: user pointers
-@@ -109,6 +110,7 @@ struct genl_info {
+@@ -133,6 +134,7 @@ struct genl_info {
  	const struct genl_family *family;
  	const struct nlmsghdr *	nlhdr;
  	struct genlmsghdr *	genlhdr;
 +	void *			userhdr;
  	struct nlattr **	attrs;
  	possible_net_t		_net;
  	void *			user_ptr[2];
-@@ -125,11 +127,6 @@ static inline void genl_info_net_set(str
+@@ -149,11 +151,6 @@ static inline void genl_info_net_set(str
  	write_pnet(&info->_net, net);
  }
 
@@ -78,7 +78,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  #define GENL_SET_ERR_MSG_FMT(info, msg, args...) \
 --- a/net/netlink/genetlink.c
 +++ b/net/netlink/genetlink.c
-@@ -957,6 +957,7 @@ static int genl_family_rcv_msg_doit(cons
+@@ -1101,6 +1101,7 @@ static int genl_family_rcv_msg_doit(cons
  	info.family = family;
  	info.nlhdr = nlh;
  	info.genlhdr = nlmsg_data(nlh);
@@ -88,7 +88,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	genl_info_net_set(&info, net);
 --- a/net/openvswitch/conntrack.c
 +++ b/net/openvswitch/conntrack.c
-@@ -1605,7 +1605,7 @@ static struct sk_buff *
+@@ -1642,7 +1642,7 @@ static struct sk_buff *
  ovs_ct_limit_cmd_reply_start(struct genl_info *info, u8 cmd,
  			     struct ovs_header **ovs_reply_header)
  {
@@ -99,7 +99,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	skb = genlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
 --- a/net/openvswitch/datapath.c
 +++ b/net/openvswitch/datapath.c
-@@ -590,7 +590,7 @@ out:
+@@ -589,7 +589,7 @@ out:
 
  static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
  {
@@ -108,7 +108,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	struct net *net = sock_net(skb->sk);
  	struct nlattr **a = info->attrs;
  	struct sw_flow_actions *acts;
-@@ -967,7 +967,7 @@ static int ovs_flow_cmd_new(struct sk_bu
+@@ -966,7 +966,7 @@ static int ovs_flow_cmd_new(struct sk_bu
  {
  	struct net *net = sock_net(skb->sk);
  	struct nlattr **a = info->attrs;
@@ -117,7 +117,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	struct sw_flow *flow = NULL, *new_flow;
  	struct sw_flow_mask mask;
  	struct sk_buff *reply;
-@@ -1214,7 +1214,7 @@ static int ovs_flow_cmd_set(struct sk_bu
+@@ -1213,7 +1213,7 @@ static int ovs_flow_cmd_set(struct sk_bu
  {
  	struct net *net = sock_net(skb->sk);
  	struct nlattr **a = info->attrs;
@@ -126,7 +126,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	struct sw_flow_key key;
  	struct sw_flow *flow;
  	struct sk_buff *reply = NULL;
-@@ -1315,7 +1315,7 @@ error:
+@@ -1314,7 +1314,7 @@ error:
  static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
  {
  	struct nlattr **a = info->attrs;
@@ -135,7 +135,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	struct net *net = sock_net(skb->sk);
  	struct sw_flow_key key;
  	struct sk_buff *reply;
-@@ -1374,7 +1374,7 @@ unlock:
+@@ -1373,7 +1373,7 @@ unlock:
  static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
  {
  	struct nlattr **a = info->attrs;
@@ -144,7 +144,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	struct net *net = sock_net(skb->sk);
  	struct sw_flow_key key;
  	struct sk_buff *reply;
-@@ -1642,7 +1642,7 @@ static void ovs_dp_reset_user_features(s
+@@ -1641,7 +1641,7 @@ static void ovs_dp_reset_user_features(s
  {
  	struct datapath *dp;
 
@@ -153,7 +153,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  			     info->attrs);
  	if (IS_ERR(dp))
  		return;
-@@ -1935,8 +1935,7 @@ static int ovs_dp_cmd_del(struct sk_buff
+@@ -1934,8 +1934,7 @@ static int ovs_dp_cmd_del(struct sk_buff
  		return -ENOMEM;
 
  	ovs_lock();
@@ -163,7 +163,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	err = PTR_ERR(dp);
  	if (IS_ERR(dp))
  		goto err_unlock_free;
-@@ -1969,8 +1968,7 @@ static int ovs_dp_cmd_set(struct sk_buff
+@@ -1968,8 +1967,7 @@ static int ovs_dp_cmd_set(struct sk_buff
  		return -ENOMEM;
 
  	ovs_lock();
@@ -173,7 +173,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	err = PTR_ERR(dp);
  	if (IS_ERR(dp))
  		goto err_unlock_free;
-@@ -2005,8 +2003,7 @@ static int ovs_dp_cmd_get(struct sk_buff
+@@ -2004,8 +2002,7 @@ static int ovs_dp_cmd_get(struct sk_buff
  		return -ENOMEM;
 
  	ovs_lock();
@@ -183,7 +183,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	if (IS_ERR(dp)) {
  		err = PTR_ERR(dp);
  		goto err_unlock_free;
-@@ -2249,7 +2246,7 @@ static void ovs_update_headroom(struct d
+@@ -2248,7 +2245,7 @@ static void ovs_update_headroom(struct d
  static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
  {
  	struct nlattr **a = info->attrs;
@@ -192,7 +192,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	struct vport_parms parms;
  	struct sk_buff *reply;
  	struct vport *vport;
-@@ -2351,7 +2348,7 @@ static int ovs_vport_cmd_set(struct sk_b
+@@ -2350,7 +2347,7 @@ static int ovs_vport_cmd_set(struct sk_b
  		return -ENOMEM;
 
  	ovs_lock();
@@ -201,7 +201,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	err = PTR_ERR(vport);
  	if (IS_ERR(vport))
  		goto exit_unlock_free;
-@@ -2407,7 +2404,7 @@ static int ovs_vport_cmd_del(struct sk_b
+@@ -2406,7 +2403,7 @@ static int ovs_vport_cmd_del(struct sk_b
  		return -ENOMEM;
 
  	ovs_lock();
@@ -210,7 +210,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	err = PTR_ERR(vport);
  	if (IS_ERR(vport))
  		goto exit_unlock_free;
-@@ -2450,7 +2447,7 @@ exit_unlock_free:
+@@ -2449,7 +2446,7 @@ exit_unlock_free:
  static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
  {
  	struct nlattr **a = info->attrs;