Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

net/core/gro.c
  7d2c89b32587 ("skb: Do mix page pool and page referenced frags in GRO")
  b1a78b9b9886 ("net: add support for ipv4 big tcp")
https://lore.kernel.org/all/20230203094454.5766f160@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc Documentation/networking/device_drivers/ethernet/intel/ice.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_dcb_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.h
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_ppe.h
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/bridge/br_netfilter_hooks.c
Simple merge

diff --cc net/core/gro.c
index b15f85546bddad4d9124b43a9fe5e34d13eafe9d,4bac7ea6e0256542429b630b3cb50a1b4cf4ae06..a606705a08595ce948f24e89d0c33f59948b5c07
--- 1/net/core/gro.c
--- 2/net/core/gro.c
+++ b/net/core/gro.c
@@@ -162,10 -162,17 +162,19 @@@ int skb_gro_receive(struct sk_buff *p, 
        struct sk_buff *lp;
        int segs;
  
 -      /* pairs with WRITE_ONCE() in netif_set_gro_max_size() */
 -      gro_max_size = READ_ONCE(p->dev->gro_max_size);
+       /* Do not splice page pool based packets w/ non-page pool
+        * packets. This can result in reference count issues as page
+        * pool pages will not decrement the reference count and will
+        * instead be immediately returned to the pool or have frag
+        * count decremented.
+        */
+       if (p->pp_recycle != skb->pp_recycle)
+               return -ETOOMANYREFS;
+ 
-                               READ_ONCE(p->dev->gro_ipv4_max_size);
 +      /* pairs with WRITE_ONCE() in netif_set_gro(_ipv4)_max_size() */
 +      gro_max_size = p->protocol == htons(ETH_P_IPV6) ?
 +                      READ_ONCE(p->dev->gro_max_size) :
++                      READ_ONCE(p->dev->gro_ipv4_max_size);
  
        if (unlikely(p->len + len >= gro_max_size || NAPI_GRO_CB(skb)->flush))
                return -E2BIG;

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_sctp.c
Simple merge

diff --cc net/qrtr/ns.c
Simple merge

diff --cc net/tls/tls_sw.c
Simple merge