]> 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>
Fri, 4 Feb 2022 01:36:16 +0000 (17:36 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 4 Feb 2022 01:36:16 +0000 (17:36 -0800)
commitc59400a68c53374179cdc5f99fa77afbd092dcf8
treec5e17286fa5b7867a5290a975cca3bc5759d510e
parent9c30918925d7992a6d812b3aa7e026839723c78a
parentdcb85f85fa6f142aae1fe86f399d4503d49f2b60
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
13 files changed:
MAINTAINERS
drivers/net/dsa/Kconfig
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/at803x.c
include/net/ax25.h
net/ax25/ax25_route.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/smc/af_smc.c
tools/bpf/resolve_btfids/Makefile