]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 2 Feb 2023 22:49:55 +0000 (14:49 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 2 Feb 2023 22:49:55 +0000 (14:49 -0800)
commit82b4a9412b4de2f68679f1403f1d229390ace27e
tree920454da3f6d509be95ae3c5c72921bfddc39c20
parentb18ea3d9d214dfb23b0b6bd2acc121cb0d0fa2c5
parentedb9b8f380c3413bf783475279b1a941c7e5cec1
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>
23 files changed:
Documentation/networking/device_drivers/ethernet/intel/ice.rst
MAINTAINERS
drivers/net/ethernet/intel/ice/ice.h
drivers/net/ethernet/intel/ice/ice_dcb_lib.c
drivers/net/ethernet/intel/ice/ice_ethtool.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/mediatek/mtk_eth_soc.h
drivers/net/ethernet/mediatek/mtk_ppe.c
drivers/net/ethernet/mediatek/mtk_ppe.h
drivers/net/phy/phy_device.c
drivers/net/virtio_net.c
kernel/bpf/btf.c
kernel/bpf/verifier.c
kernel/trace/bpf_trace.c
kernel/trace/ftrace.c
lib/Kconfig.debug
net/bridge/br_netfilter_hooks.c
net/core/gro.c
net/core/skbuff.c
net/netfilter/nf_conntrack_proto_sctp.c
net/qrtr/ns.c
net/tls/tls_sw.c