]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f32a97 577853f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 11 Jul 2020 07:46:00 +0000 (00:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jul 2020 07:46:00 +0000 (00:46 -0700)
commit25c8bff2b57a558f387f50cab16c49cafaa3603e
tree43b642f15d33ae6ba08a31ddf2d50e2915868a5etree | snapshot
parent1f32a97303b8cd833887379a5a66e1d67ead7bdecommit | diff
parent577853f434392cb3de96820d237279e1ae49cacbcommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.

Signed-off-by: David S. Miller <davem@davemloft.net>
59 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/microchip/ksz8795.c diff1 | diff2 | blob | history
drivers/net/dsa/microchip/ksz9477.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/enetc/enetc.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvneta.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/port.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.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_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed.h diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_debug.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_dev.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_mcp.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_mcp.h diff1 | diff2 | blob | history
drivers/net/ipa/gsi.c diff1 | diff2 | blob | history
drivers/net/ipa/ipa_endpoint.c diff1 | diff2 | blob | history
include/linux/bpf.h diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
include/uapi/linux/bpf.h diff1 | diff2 | blob | history
kernel/bpf/btf.c diff1 | diff2 | blob | history
kernel/bpf/reuseport_array.c diff1 | diff2 | blob | history
kernel/bpf/ringbuf.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/bridge/br_private.h diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/core/sock_map.c diff1 | diff2 | blob | history
net/ethtool/netlink.c diff1 | diff2 | blob | history
net/hsr/hsr_device.c diff1 | diff2 | blob | history
net/ipv4/ip_output.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/icmp.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/mptcp/options.c diff1 | diff2 | blob | history
net/sched/act_csum.c diff1 | diff2 | blob | history
net/sched/act_ct.c diff1 | diff2 | blob | history
net/sched/act_skbedit.c diff1 | diff2 | blob | history
net/sched/cls_api.c diff1 | diff2 | blob | history
net/sched/cls_flower.c diff1 | diff2 | blob | history
net/sched/sch_atm.c diff1 | diff2 | blob | history
net/sched/sch_cake.c diff1 | diff2 | blob | history
net/sched/sch_dsmark.c diff1 | diff2 | blob | history
net/sched/sch_teql.c diff1 | diff2 | blob | history
net/tipc/link.c diff1 | diff2 | blob | history
tools/include/uapi/linux/bpf.h diff1 | diff2 | blob | history
tools/lib/bpf/libbpf.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.