From ccf92add043b6372574ecdabb7282e7e78061cb7 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Tue, 6 Sep 2022 15:20:42 +0800 Subject: [PATCH] kernel: bump 5.19 to 5.19.7 (#10059) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- include/kernel-5.19 | 4 ++-- .../linux/generic/hack-5.19/250-netfilter_depends.patch | 4 ++-- .../650-netfilter-add-xt_FLOWOFFLOAD-target.patch | 6 +++--- ...net-conntrack-events-support-multiple-registrant.patch | 2 +- ...53-net-patch-linux-kernel-to-support-shortcut-fe.patch | 6 +++--- .../linux/generic/pending-5.19/655-increase_skb_pad.patch | 2 +- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/kernel-5.19 b/include/kernel-5.19 index 98eabdd3f..e8acb4b2c 100644 --- a/include/kernel-5.19 +++ b/include/kernel-5.19 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.19 = .6 -LINUX_KERNEL_HASH-5.19.6 = 41a4f824af614460c429a7c723e8dcbb0e042f0047d328c18b4ed6f2b4efa63a +LINUX_VERSION-5.19 = .7 +LINUX_KERNEL_HASH-5.19.7 = b8bb6019d4255f39196726f9d0f82f76179d1c3d7c6b603431ef04b38201199f diff --git a/target/linux/generic/hack-5.19/250-netfilter_depends.patch b/target/linux/generic/hack-5.19/250-netfilter_depends.patch index 4c358a73b..045875fd8 100644 --- a/target/linux/generic/hack-5.19/250-netfilter_depends.patch +++ b/target/linux/generic/hack-5.19/250-netfilter_depends.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -254,7 +254,6 @@ config NF_CONNTRACK_FTP +@@ -253,7 +253,6 @@ config NF_CONNTRACK_FTP config NF_CONNTRACK_H323 tristate "H.323 protocol support" @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau depends on NETFILTER_ADVANCED help H.323 is a VoIP signalling protocol from ITU-T. As one of the most -@@ -1111,7 +1110,6 @@ config NETFILTER_XT_TARGET_SECMARK +@@ -1110,7 +1109,6 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic/hack-5.19/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-5.19/650-netfilter-add-xt_FLOWOFFLOAD-target.patch index 2bc1dab5f..fdac77b96 100644 --- a/target/linux/generic/hack-5.19/650-netfilter-add-xt_FLOWOFFLOAD-target.patch +++ b/target/linux/generic/hack-5.19/650-netfilter-add-xt_FLOWOFFLOAD-target.patch @@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -713,8 +713,6 @@ config NFT_REJECT_NETDEV +@@ -712,8 +712,6 @@ config NFT_REJECT_NETDEV endif # NF_TABLES_NETDEV @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau config NF_FLOW_TABLE_INET tristate "Netfilter flow table mixed IPv4/IPv6 module" depends on NF_FLOW_TABLE -@@ -723,11 +721,12 @@ config NF_FLOW_TABLE_INET +@@ -722,11 +720,12 @@ config NF_FLOW_TABLE_INET To compile it as a module, choose M here. @@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau help This option adds the flow table core infrastructure. -@@ -1016,6 +1015,15 @@ config NETFILTER_XT_TARGET_NOTRACK +@@ -1015,6 +1014,15 @@ config NETFILTER_XT_TARGET_NOTRACK depends on NETFILTER_ADVANCED select NETFILTER_XT_TARGET_CT diff --git a/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch index 7698e80e7..b3cf1e0a3 100644 --- a/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch @@ -106,7 +106,7 @@ Signed-off-by: Zhi Chen #if defined(CONFIG_NF_CONNTRACK_LABELS) --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -162,6 +162,14 @@ config NF_CONNTRACK_EVENTS +@@ -161,6 +161,14 @@ config NF_CONNTRACK_EVENTS If unsure, say `N'. diff --git a/target/linux/generic/hack-5.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 9e2da5fde..3cc6f5cd3 100644 --- a/target/linux/generic/hack-5.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -111,7 +111,7 @@ len = skb->len; trace_net_dev_start_xmit(skb, dev); -@@ -5232,6 +5240,11 @@ void netdev_rx_handler_unregister(struct +@@ -5233,6 +5241,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. -@@ -5280,6 +5293,10 @@ static int __netif_receive_skb_core(stru +@@ -5281,6 +5294,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); -@@ -5317,6 +5334,15 @@ another_round: +@@ -5318,6 +5335,15 @@ another_round: goto out; } diff --git a/target/linux/generic/pending-5.19/655-increase_skb_pad.patch b/target/linux/generic/pending-5.19/655-increase_skb_pad.patch index 8fbc91588..81367e1ee 100644 --- a/target/linux/generic/pending-5.19/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-5.19/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -3088,7 +3088,7 @@ static inline int pskb_network_may_pull( +@@ -3096,7 +3096,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 50a0c0943..88c78b664 100644 --- a/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u8 inner_protocol_type:1; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -7595,6 +7595,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7596,6 +7596,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -81,7 +81,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7646,6 +7688,7 @@ static int __netdev_upper_dev_link(struc +@@ -7647,6 +7689,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -89,7 +89,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7737,6 +7780,7 @@ static void __netdev_upper_dev_unlink(st +@@ -7738,6 +7781,7 @@ static void __netdev_upper_dev_unlink(st changeupper_info.master = netdev_master_upper_dev_get(dev) == upper_dev; @@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_PRECHANGEUPPER, &changeupper_info.info); -@@ -8794,6 +8838,7 @@ int dev_set_mac_address(struct net_devic +@@ -8795,6 +8839,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET;