kernel: bump 6.18 to 6.18.36

coolsnowwolf · coolsnowwolf · commit 405f95510781 · 2026-07-12T08:55:11.000+08:00
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.36 Removed upstreamed: airoha/patches-6.18/162-v7.2-net-airoha-Fix-use-after-free-in-metadata-dst-teardo.patch[1] airoha/patches-6.18/164-v7.2-net-airoha-Add-NULL-check-for-of_reserved_mem_lookup.patch[2] All other patches automatically rebased via update_kernel.sh A new option was introduced with this release[3]. Updated configs on affected targets: armsr/armv8 and rockchip/armv8. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.36&id=6f829e2c17a53a35321268339cd252aff6d6d723 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.36&id=01f7d4b504580664d36faea5671cde5e3f0d8a5b 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/arch/arm64/Kconfig?id=v6.18.36&id2=v6.18.35 Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: #23887 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
diff --git a/include/kernel-6.18 b/include/kernel-6.18
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.18 = .35
-LINUX_KERNEL_HASH-6.18.35 = f78602932219125e211c5f5bfd84edcfd4ec5ce88fc944f8248413f665bef236
+LINUX_VERSION-6.18 = .38
+LINUX_KERNEL_HASH-6.18.38 = ac26e508abd56e9f8b89872b6e10c49fc823bcc70d8068a5d8504c1a7c4ff045
diff --git a/target/linux/generic/backport-6.18/746-v7.1-r8152-Add-support-for-5Gbit-Link-Speeds-and-EEE.patch b/target/linux/generic/backport-6.18/746-v7.1-r8152-Add-support-for-5Gbit-Link-Speeds-and-EEE.patch
@@ -221,7 +221,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  	eee->eee_enabled = tp->eee_en;
  
  	if (speed & _1000bps)
-@@ -9381,6 +9440,11 @@ static int rtl8152_probe_once(struct usb
+@@ -9386,6 +9445,11 @@ static int rtl8152_probe_once(struct usb
  		} else {
  			tp->speed = SPEED_1000;
  		}
diff --git a/target/linux/generic/backport-6.18/747-v7.1-r8152-Add-support-for-the-RTL8157-hardware.patch b/target/linux/generic/backport-6.18/747-v7.1-r8152-Add-support-for-the-RTL8157-hardware.patch
@@ -1535,15 +1535,15 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  	default:
  		version = RTL_VER_UNKNOWN;
  		dev_info(&udev->dev, "Unknown version 0x%04x\n", ocp_data);
-@@ -9411,6 +9954,7 @@ static int rtl8152_probe_once(struct usb
+@@ -9416,6 +9959,7 @@ static int rtl8152_probe_once(struct usb
  	case RTL_VER_12:
  	case RTL_VER_13:
  	case RTL_VER_15:
 +	case RTL_VER_16:
  		netdev->max_mtu = size_to_mtu(16 * 1024);
  		break;
  	case RTL_VER_01:
-@@ -9571,6 +10115,7 @@ static const struct usb_device_id rtl815
+@@ -9576,6 +10120,7 @@ static const struct usb_device_id rtl815
  	{ USB_DEVICE(VENDOR_ID_REALTEK, 0x8153) },
  	{ USB_DEVICE(VENDOR_ID_REALTEK, 0x8155) },
  	{ USB_DEVICE(VENDOR_ID_REALTEK, 0x8156) },
diff --git a/target/linux/generic/hack-6.18/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.18/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
@@ -768,7 +768,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		      void (*iter)(struct nf_flowtable *flowtable,
  				   struct flow_offload *flow, void *data),
  		      void *data)
-@@ -582,6 +580,7 @@ static void nf_flow_offload_gc_step(stru
+@@ -587,6 +585,7 @@ static void nf_flow_offload_gc_step(stru
  		nf_flow_offload_stats(flow_table, flow);
  	}
  }
diff --git a/target/linux/generic/hack-6.18/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-6.18/721-net-add-packet-mangeling.patch
@@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -3870,6 +3870,11 @@ static int xmit_one(struct sk_buff *skb,
+@@ -3871,6 +3871,11 @@ static int xmit_one(struct sk_buff *skb,
  	if (dev_nit_active_rcu(dev))
  		dev_queue_xmit_nit(skb, dev);
  
diff --git a/target/linux/generic/hack-6.18/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.18/780-usb-net-MeigLink_modem_support.patch
@@ -32,7 +32,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  	{QMI_FIXED_INTF(0x0408, 0xea42, 4)},	/* Yota / Megafon M100-1 */
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -247,6 +247,11 @@ static void option_instat_callback(struc
+@@ -248,6 +248,11 @@ static void option_instat_callback(struc
  #define UBLOX_PRODUCT_R410M			0x90b2
  /* These Yuga products use Qualcomm's vendor ID */
  #define YUGA_PRODUCT_CLM920_NC5			0x9625
@@ -44,7 +44,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1156,6 +1161,11 @@ static const struct usb_device_id option
+@@ -1159,6 +1164,11 @@ static const struct usb_device_id option
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
  	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
@@ -56,7 +56,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  	/* Quectel products using Qualcomm vendor ID */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
-@@ -1197,6 +1207,11 @@ static const struct usb_device_id option
+@@ -1200,6 +1210,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },
diff --git a/target/linux/generic/hack-6.18/901-debloat_sock_diag.patch b/target/linux/generic/hack-6.18/901-debloat_sock_diag.patch
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
  							  u32));
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
-@@ -2406,9 +2423,11 @@ static void __sk_free(struct sock *sk)
+@@ -2411,9 +2428,11 @@ static void __sk_free(struct sock *sk)
  	if (likely(sk->sk_net_refcnt))
  		sock_inuse_add(sock_net(sk), -1);
  
diff --git a/target/linux/generic/hack-6.18/902-debloat_proc.patch b/target/linux/generic/hack-6.18/902-debloat_proc.patch
@@ -331,7 +331,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4349,6 +4349,8 @@ static __net_initdata struct pernet_oper
+@@ -4358,6 +4358,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {
diff --git a/target/linux/generic/hack-6.18/932-usb-net-for-td-mt5700.patch b/target/linux/generic/hack-6.18/932-usb-net-for-td-mt5700.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -627,6 +627,9 @@ static void option_instat_callback(struc
+@@ -628,6 +628,9 @@ static void option_instat_callback(struc
  /* Luat Air72*U series based on UNISOC UIS8910 uses UNISOC's vendor ID */
  #define LUAT_PRODUCT_AIR720U			0x4e00
  
@@ -10,7 +10,7 @@
  /* Device flags */
  
  /* Highest interface number which can be used with NCTRL() and RSVD() */
-@@ -2543,6 +2546,12 @@ static const struct usb_device_id option
+@@ -2546,6 +2549,12 @@ static const struct usb_device_id option
  	{ USB_DEVICE_INTERFACE_CLASS(0x1bbb, 0x0640, 0xff),			/* TCL IK512 ECM */
  	  .driver_info = NCTRL(3) },
  	{ USB_DEVICE_INTERFACE_CLASS(0x2949, 0x8700, 0xff) },			/* Neoway N723-EA */
diff --git a/target/linux/generic/hack-6.18/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-6.18/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
@@ -78,7 +78,7 @@
  	struct net_bridge_port *p;
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -3866,9 +3866,17 @@ static int xmit_one(struct sk_buff *skb,
+@@ -3867,9 +3867,17 @@ static int xmit_one(struct sk_buff *skb,
  {
  	unsigned int len;
  	int rc;
@@ -97,7 +97,7 @@
  
  #ifdef CONFIG_ETHERNET_PACKET_MANGLE
  	if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
-@@ -5852,6 +5860,11 @@ void netdev_rx_handler_unregister(struct
+@@ -5853,6 +5861,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.
-@@ -5901,6 +5914,10 @@ static int __netif_receive_skb_core(stru
+@@ -5902,6 +5915,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);
-@@ -5945,6 +5962,15 @@ another_round:
+@@ -5946,6 +5963,15 @@ another_round:
  			goto out;
  	}
  
diff --git a/target/linux/generic/hack-6.18/991-revert-init_dummy_netdev.patch b/target/linux/generic/hack-6.18/991-revert-init_dummy_netdev.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -3406,6 +3406,7 @@ static inline void unregister_netdevice(
+@@ -3417,6 +3417,7 @@ static inline void unregister_netdevice(
  
  int netdev_refcnt_read(const struct net_device *dev);
  void free_netdev(struct net_device *dev);
@@ -10,7 +10,7 @@
  					 struct sk_buff *skb,
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -11444,7 +11444,7 @@ EXPORT_SYMBOL(register_netdevice);
+@@ -11445,7 +11445,7 @@ EXPORT_SYMBOL(register_netdevice);
   * The setup steps dummy netdevs need which normal netdevs get by going
   * through register_netdevice().
   */
@@ -19,7 +19,7 @@
  {
  	/* make sure we BUG if trying to hit standard
  	 * register/unregister code path
-@@ -11460,6 +11460,7 @@ static void init_dummy_netdev(struct net
+@@ -11461,6 +11461,7 @@ static void init_dummy_netdev(struct net
  	 * its refcount.
  	 */
  }
diff --git a/target/linux/generic/hack-6.18/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch b/target/linux/generic/hack-6.18/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch
@@ -126,7 +126,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
  	struct sw_flow_key key;
  	struct sw_flow *flow;
  	struct sk_buff *reply = NULL;
-@@ -1344,7 +1344,7 @@ error:
+@@ -1345,7 +1345,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;
-@@ -1403,7 +1403,7 @@ unlock:
+@@ -1404,7 +1404,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;
-@@ -1671,7 +1671,7 @@ static void ovs_dp_reset_user_features(s
+@@ -1672,7 +1672,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;
-@@ -1963,8 +1963,7 @@ static int ovs_dp_cmd_del(struct sk_buff
+@@ -1964,8 +1964,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;
-@@ -1997,8 +1996,7 @@ static int ovs_dp_cmd_set(struct sk_buff
+@@ -1998,8 +1997,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;
-@@ -2033,8 +2031,7 @@ static int ovs_dp_cmd_get(struct sk_buff
+@@ -2034,8 +2032,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;
-@@ -2314,7 +2311,7 @@ static void ovs_update_headroom(struct d
+@@ -2315,7 +2312,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;
-@@ -2415,7 +2412,7 @@ static int ovs_vport_cmd_set(struct sk_b
+@@ -2416,7 +2413,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;
-@@ -2471,7 +2468,7 @@ static int ovs_vport_cmd_del(struct sk_b
+@@ -2472,7 +2469,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;
-@@ -2514,7 +2511,7 @@ exit_unlock_free:
+@@ -2515,7 +2512,7 @@ exit_unlock_free:
  static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
  {
  	struct nlattr **a = info->attrs;
diff --git a/target/linux/generic/hack-6.18/999-revert-6.5-deprecated-API.patch b/target/linux/generic/hack-6.18/999-revert-6.5-deprecated-API.patch
@@ -44,7 +44,7 @@
  #endif /* _LINUX_U64_STATS_SYNC_H */
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -3290,6 +3290,8 @@ int call_netdevice_notifiers(unsigned lo
+@@ -3301,6 +3301,8 @@ int call_netdevice_notifiers(unsigned lo
  int call_netdevice_notifiers_info(unsigned long val,
  				  struct netdev_notifier_info *info);
  
diff --git a/target/linux/generic/pending-6.18/103-kbuild-export-SUBARCH.patch b/target/linux/generic/pending-6.18/103-kbuild-export-SUBARCH.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -628,7 +628,7 @@ export RUSTC_BOOTSTRAP := 1
+@@ -629,7 +629,7 @@ export RUSTC_BOOTSTRAP := 1
  # Allows finding `.clippy.toml` in out-of-srctree builds.
  export CLIPPY_CONF_DIR := $(srctree)
  
diff --git a/target/linux/generic/pending-6.18/454-block-add-support-for-notifications.patch b/target/linux/generic/pending-6.18/454-block-add-support-for-notifications.patch
@@ -149,7 +149,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +device_initcall(blk_notifications_init);
 --- a/include/linux/blkdev.h
 +++ b/include/linux/blkdev.h
-@@ -1875,4 +1875,12 @@ static inline int bio_split_rw_at(struct
+@@ -1871,4 +1871,12 @@ static inline int bio_split_rw_at(struct
  
  #define DEFINE_IO_COMP_BATCH(name)	struct io_comp_batch name = { }
  
diff --git a/target/linux/generic/pending-6.18/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-6.18/610-netfilter_match_bypass_default_checks.patch
@@ -4,8 +4,8 @@ Subject: kernel: add a new version of my netfilter speedup patches for linux 2.6
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  include/uapi/linux/netfilter_ipv4/ip_tables.h |  1 +
- net/ipv4/netfilter/ip_tables.c                | 37 +++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
+ net/ipv4/netfilter/ip_tables.c                | 41 +++++++++++++++++++++++++++-
+ 2 files changed, 41 insertions(+), 1 deletion(-)
 
 --- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
 +++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
@@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	counters = alloc_counters(table);
  	if (IS_ERR(counters))
-@@ -844,6 +873,14 @@ copy_entries_to_user(unsigned int total_
+@@ -842,6 +871,14 @@ copy_entries_to_user(unsigned int total_
  			goto free_counters;
  		}
  
@@ -91,20 +91,18 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		for (i = sizeof(struct ipt_entry);
  		     i < e->target_offset;
  		     i += m->u.match_size) {
-@@ -1225,12 +1262,15 @@ compat_copy_entry_to_user(struct ipt_ent
+@@ -1223,11 +1260,13 @@ compat_copy_entry_to_user(struct ipt_ent
  	compat_uint_t origsize;
  	const struct xt_entry_match *ematch;
  	int ret = 0;
 +	u8 flags = e->ip.flags & IPT_F_MASK;
  
  	origsize = *size;
  	ce = *dstptr;
- 	if (copy_to_user(ce, e, sizeof(struct ipt_entry)) != 0 ||
- 	    copy_to_user(&ce->counters, &counters[i],
--	    sizeof(counters[i])) != 0)
-+	    sizeof(counters[i])) != 0 ||
-+	    copy_to_user(&ce->ip.flags, &flags,
-+	    sizeof(flags)) != 0)
+ 	if (copy_to_user(ce, e, offsetof(struct compat_ipt_entry, counters)) ||
+-	    copy_to_user(&ce->counters, &counters[i], sizeof(counters[i])))
++	    copy_to_user(&ce->counters, &counters[i], sizeof(counters[i])) ||
++	    copy_to_user(&ce->ip.flags, &flags, sizeof(flags)))
  		return -EFAULT;
  
  	*dstptr += sizeof(struct compat_ipt_entry);
diff --git a/target/linux/generic/pending-6.18/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch b/target/linux/generic/pending-6.18/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch
@@ -96,7 +96,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  }
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2620,7 +2620,7 @@ void sk_setup_caps(struct sock *sk, stru
+@@ -2625,7 +2625,7 @@ void sk_setup_caps(struct sock *sk, stru
  		icsk->icsk_ack.dst_quick_ack = dst_metric(dst, RTAX_QUICKACK);
  	}
  	if (sk->sk_route_caps & NETIF_F_GSO)
diff --git a/target/linux/generic/pending-6.18/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch b/target/linux/generic/pending-6.18/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
@@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 
 --- a/net/netfilter/nf_flow_table_core.c
 +++ b/net/netfilter/nf_flow_table_core.c
-@@ -805,6 +805,23 @@ static struct pernet_operations nf_flow_
+@@ -810,6 +810,23 @@ static struct pernet_operations nf_flow_
  	.exit_batch = nf_flow_table_pernet_exit,
  };
  
@@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  static int __init nf_flow_table_module_init(void)
  {
  	int ret;
-@@ -821,6 +838,10 @@ static int __init nf_flow_table_module_i
+@@ -826,6 +843,10 @@ static int __init nf_flow_table_module_i
  	if (ret)
  		goto out_bpf;
  
@@ -45,7 +45,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  	return 0;
  
  out_bpf:
-@@ -832,6 +853,7 @@ out_offload:
+@@ -837,6 +858,7 @@ out_offload:
  
  static void __exit nf_flow_table_module_exit(void)
  {
diff --git a/target/linux/generic/pending-6.18/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-6.18/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1836,6 +1836,9 @@ void phy_detach(struct phy_device *phyde
+@@ -1839,6 +1839,9 @@ void phy_detach(struct phy_device *phyde
  		phydev->devlink = NULL;
  	}
  
diff --git a/target/linux/generic/pending-6.18/706-net-phy-populate-host_interfaces-when-attaching-PHY.patch b/target/linux/generic/pending-6.18/706-net-phy-populate-host_interfaces-when-attaching-PHY.patch
@@ -20,7 +20,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -2278,7 +2278,7 @@ int phylink_fwnode_phy_connect(struct ph
+@@ -2282,7 +2282,7 @@ int phylink_fwnode_phy_connect(struct ph
  {
  	struct fwnode_handle *phy_fwnode;
  	struct phy_device *phy_dev;
@@ -29,7 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  	/* Fixed links and 802.3z are handled without needing a PHY */
  	if (pl->cfg_link_an_mode == MLO_AN_FIXED ||
-@@ -2308,6 +2308,25 @@ int phylink_fwnode_phy_connect(struct ph
+@@ -2312,6 +2312,25 @@ int phylink_fwnode_phy_connect(struct ph
  	if (pl->config->mac_requires_rxc)
  		flags |= PHY_F_RXC_ALWAYS_ON;
  
diff --git a/target/linux/generic/pending-6.18/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-6.18/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
diff --git a/target/linux/rockchip/patches-6.18/071-14-v6.19-arm64-dts-rockchip-Enable-PCIe-controller-on-Radxa-E20C.patch b/target/linux/rockchip/patches-6.18/071-14-v6.19-arm64-dts-rockchip-Enable-PCIe-controller-on-Radxa-E20C.patch
diff --git a/target/linux/rockchip/patches-6.18/112-ethernet-stmicro-stmmac-Add-SGMII-QSGMII-support.patch b/target/linux/rockchip/patches-6.18/112-ethernet-stmicro-stmmac-Add-SGMII-QSGMII-support.patch
diff --git a/target/linux/rockchip/patches-6.18/120-arm64-dts-rockchip-add-led-aliases-and-stop-heartbeat-for-nanopc-t6.patch b/target/linux/rockchip/patches-6.18/120-arm64-dts-rockchip-add-led-aliases-and-stop-heartbeat-for-nanopc-t6.patch
diff --git a/target/linux/rockchip/patches-6.18/122-rock-3c-add-led-aliases-and-stop-heartbeat.patch b/target/linux/rockchip/patches-6.18/122-rock-3c-add-led-aliases-and-stop-heartbeat.patch
diff --git a/target/linux/rockchip/patches-6.18/205-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch b/target/linux/rockchip/patches-6.18/205-rockchip-rk3328-add-support-for-FriendlyARM-NanoPi-Neo3.patch
diff --git a/target/linux/rockchip/patches-6.18/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch b/target/linux/rockchip/patches-6.18/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>`
`221`	`221`	`eee->eee_enabled = tp->eee_en;`
`222`	`222`
`223`	`223`	`if (speed & _1000bps)`
`224`		`-@@ -9381,6 +9440,11 @@ static int rtl8152_probe_once(struct usb`
	`224`	`+@@ -9386,6 +9445,11 @@ static int rtl8152_probe_once(struct usb`
`225`	`225`	`} else {`
`226`	`226`	`tp->speed = SPEED_1000;`
`227`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>`
`768`	`768`	`void (iter)(struct nf_flowtable flowtable,`
`769`	`769`	`struct flow_offload flow, void data),`
`770`	`770`	`void *data)`
`771`		`-@@ -582,6 +580,7 @@ static void nf_flow_offload_gc_step(stru`
	`771`	`+@@ -587,6 +585,7 @@ static void nf_flow_offload_gc_step(stru`
`772`	`772`	`nf_flow_offload_stats(flow_table, flow);`
`773`	`773`	`}`
`774`	`774`	`}`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>`
`331`	`331`
`332`	`332`	`--- a/net/core/sock.c`
`333`	`333`	`+++ b/net/core/sock.c`
`334`		`-@@ -4349,6 +4349,8 @@ static __net_initdata struct pernet_oper`
	`334`	`+@@ -4358,6 +4358,8 @@ static __net_initdata struct pernet_oper`
`335`	`335`
`336`	`336`	`static int __init proto_init(void)`
`337`	`337`	`{`