projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7126bd5 ac3a0c8)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 2 Aug 2020 08:02:12 +0000 (01:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 2 Aug 2020 08:02:12 +0000 (01:02 -0700)
commitbd0b33b24897ba9ddad221e8ac5b6f0e38a2e004
tree3f03062a9e759dba7b09df0feccbb58b8f7ab4cctree | snapshot
parent7126bd5c8bcbc015cf89864cf71d750e8f33f924commit | diff
parentac3a0c8472969a03c0496ae774b3a29eb26c8d5acommit | diff
Merge git://git./linux/kernel/git/netdev/net

Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7248d2396ab85c8652e20c0c39beaba

Signed-off-by: David S. Miller <davem@davemloft.net>
46 files changed:
MAINTAINERS diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
drivers/net/bareudp.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000e/ich8lan.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igb/igb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/core.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/reg.h diff1 | diff2 | blob | history
drivers/net/ethernet/mscc/ocelot.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_lif.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/net/devlink.h diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
kernel/bpf/btf.c diff1 | diff2 | blob | history
kernel/bpf/hashtab.c diff1 | diff2 | blob | history
net/bluetooth/hci_event.c diff1 | diff2 | blob | history
net/bpfilter/bpfilter_kern.c diff1 | diff2 | blob | history
net/compat.c diff1 | diff2 | blob | history
net/core/devlink.c diff1 | diff2 | blob | history
net/ipv4/fib_trie.c diff1 | diff2 | blob | history
net/ipv6/ipv6_sockglue.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/key/af_key.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/mesh.c diff1 | diff2 | blob | history
net/mac80211/mesh_pathtbl.c diff1 | diff2 | blob | history
net/mac80211/sta_info.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/sched/act_ct.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
tools/testing/selftests/net/forwarding/ethtool.sh diff1 | diff2 | blob | history
tools/testing/selftests/net/rxtimestamp.c diff1 | diff2 | blob | history
https://github.com/torvalds/linux.git