git.ipfire.org Git - thirdparty/linux.git/commit - drivers/net/ethernet/mellanox/mlx5/core/en

]> git.ipfire.org Git - thirdparty/linux.git/commit - drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

projects / thirdparty / linux.git / commit

author	David S. Miller <davem@davemloft.net>
	Fri, 8 Feb 2019 23:00:17 +0000 (15:00 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 8 Feb 2019 23:00:17 +0000 (15:00 -0800)
commit	a655fe9f194842693258f43b5382855db1c2f654
tree	a6e523c42378f43881c421530941dcbb529461ab	tree \| snapshot
parent	7499a288bf1a4a49be9d72beb0a5c7b9aa6ffec9	commit \| diff
parent	27b4ad621e887ce8e5eb508a0103f13d30f6b38a	commit \| diff

Merge git://git.kernel.org/pub/scm/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	diff1 \|	diff2 \|	blob \| history
arch/riscv/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.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/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_spq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ipvlan/ipvlan_l3s.c	diff1 \|	\|	blob \| history
drivers/net/phy/dp83640.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/dscc4.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/hashtab.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_v_elp.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/hard-interface.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/skmsg.c	diff1 \|	diff2 \|	blob \| history
net/dsa/master.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_dynset.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_immediate.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_objref.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_cdc.h	diff1 \|	diff2 \|	blob \| history
net/smc/smc_close.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/map.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/prog.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_btf.c	diff1 \|	diff2 \|	blob \| history

A mirror of Linus' kernel repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/riscv/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.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/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_spq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ipvlan/ipvlan_l3s.c	diff1 \|	\|	blob \| history
drivers/net/phy/dp83640.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/dscc4.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core.h	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l2_main.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/hashtab.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bat_v_elp.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/hard-interface.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/skmsg.c	diff1 \|	diff2 \|	blob \| history
net/dsa/master.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_dynset.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_immediate.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_objref.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_cdc.h	diff1 \|	diff2 \|	blob \| history
net/smc/smc_close.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/map.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/prog.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_btf.c	diff1 \|	diff2 \|	blob \| history