Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Feb 2019 23:00:17 +0000 (15:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Feb 2019 23:00:17 +0000 (15:00 -0800)
commita655fe9f194842693258f43b5382855db1c2f654
treea6e523c42378f43881c421530941dcbb529461ab
parent7499a288bf1a4a49be9d72beb0a5c7b9aa6ffec9
parent27b4ad621e887ce8e5eb508a0103f13d30f6b38a
Merge git://git./linux/kernel/git/davem/net

An ipvlan bug fix in 'net' conflicted with the abstraction away
of the IPV6 specific support in 'net-next'.

Similarly, a bug fix for mlx5 in 'net' conflicted with the flow
action conversion in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
54 files changed:
MAINTAINERS
arch/riscv/Kconfig
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
drivers/net/ethernet/qlogic/qed/qed.h
drivers/net/ethernet/qlogic/qed/qed_spq.c
drivers/net/ethernet/qlogic/qede/qede.h
drivers/net/ethernet/qlogic/qede/qede_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ipvlan/ipvlan_l3s.c
drivers/net/phy/dp83640.c
drivers/net/phy/marvell.c
drivers/net/virtio_net.c
drivers/net/wan/dscc4.c
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
drivers/s390/net/qeth_core.h
drivers/s390/net/qeth_core_main.c
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c
include/linux/filter.h
include/linux/netdevice.h
include/net/netfilter/nf_tables.h
kernel/bpf/btf.c
kernel/bpf/cgroup.c
kernel/bpf/hashtab.c
kernel/bpf/syscall.c
net/batman-adv/bat_v_elp.c
net/batman-adv/hard-interface.c
net/batman-adv/soft-interface.c
net/core/filter.c
net/core/skmsg.c
net/dsa/master.c
net/dsa/slave.c
net/ipv4/ip_gre.c
net/ipv6/ip6_gre.c
net/mac80211/tx.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_tables_api.c
net/netfilter/nft_dynset.c
net/netfilter/nft_immediate.c
net/netfilter/nft_objref.c
net/sched/cls_flower.c
net/sctp/socket.c
net/smc/af_smc.c
net/smc/smc_cdc.h
net/smc/smc_close.c
net/smc/smc_core.c
net/socket.c
tools/bpf/bpftool/map.c
tools/bpf/bpftool/prog.c
tools/testing/selftests/bpf/test_btf.c