projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0f473bb
6441998
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Fri, 17 Dec 2021 00:13:19 +0000
(16:13 -0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Fri, 17 Dec 2021 00:13:19 +0000
(16:13 -0800)
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
31 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/net/bpf_jit_comp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/mlx5/mlx5_ib.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/dsa/mv88e6xxx/chip.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/hisilicon/hns3/hnae3.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/iavf/iavf_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_ptp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/igb/igb_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/sfc/ef100_nic.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/stmicro/stmmac/stmmac.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/ti/am65-cpsw-nuss.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/netdevsim/ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/phy/mdio_bus.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/lan78xx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/virtio_net.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/intel/iwlwifi/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/bpf/verifier.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/skbuff.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/sit.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mptcp/pm_netlink.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mptcp/protocol.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mptcp/sockopt.c
patch
|
diff1
|
diff2
|
blob
|
history
net/packet/af_packet.c
patch
|
diff1
|
diff2
|
blob
|
history
net/smc/af_smc.c
patch
|
diff1
|
diff2
|
blob
|
history
net/xdp/xsk.c
patch
|
diff1
|
diff2
|
blob
|
history
tools/testing/selftests/bpf/test_verifier.c
patch
|
diff1
|
diff2
|
blob
|
history
tools/testing/selftests/net/fcnal-test.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
arch/x86/net/bpf_jit_comp.c
Simple merge
diff --cc
drivers/infiniband/hw/mlx5/mlx5_ib.h
Simple merge
diff --cc
drivers/net/dsa/mv88e6xxx/chip.c
Simple merge
diff --cc
drivers/net/ethernet/hisilicon/hns3/hnae3.h
Simple merge
diff --cc
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
Simple merge
diff --cc
drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_ptp.c
Simple merge
diff --cc
drivers/net/ethernet/intel/igb/igb_main.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge
diff --cc
drivers/net/ethernet/sfc/ef100_nic.c
Simple merge
diff --cc
drivers/net/ethernet/stmicro/stmmac/stmmac.h
Simple merge
diff --cc
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge
diff --cc
drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge
diff --cc
drivers/net/netdevsim/ethtool.c
Simple merge
diff --cc
drivers/net/phy/mdio_bus.c
Simple merge
diff --cc
drivers/net/usb/lan78xx.c
Simple merge
diff --cc
drivers/net/virtio_net.c
Simple merge
diff --cc
drivers/net/wireless/intel/iwlwifi/Kconfig
Simple merge
diff --cc
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Simple merge
diff --cc
kernel/bpf/verifier.c
Simple merge
diff --cc
net/core/skbuff.c
Simple merge
diff --cc
net/ipv6/sit.c
Simple merge
diff --cc
net/mptcp/pm_netlink.c
Simple merge
diff --cc
net/mptcp/protocol.c
Simple merge
diff --cc
net/mptcp/sockopt.c
Simple merge
diff --cc
net/packet/af_packet.c
Simple merge
diff --cc
net/smc/af_smc.c
Simple merge
diff --cc
net/xdp/xsk.c
Simple merge
diff --cc
tools/testing/selftests/bpf/test_verifier.c
Simple merge
diff --cc
tools/testing/selftests/net/fcnal-test.sh
Simple merge