git.kernel.dk Git - linux-2.6-block.git/commit

author	David S. Miller <davem@davemloft.net>
	Tue, 9 Jul 2019 02:48:57 +0000 (19:48 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 9 Jul 2019 02:48:57 +0000 (19:48 -0700)
commit	af144a983402f7fd324ce556d9f9011a8b3e01fe
tree	7a0250b960a36976bc683789d9fe86b9f60a97a5	tree \| snapshot
parent	6413139dfc641aaaa30580b59696a5f7ea274194	commit \| diff
parent	e858faf556d4e14c750ba1e8852783c6f9520a0e	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Two cases of overlapping changes, nothing fancy.

Signed-off-by: David S. Miller <davem@davemloft.net>

51 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/allwinner/sun4i-emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/wmm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt76.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/phylink.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
include/net/xdp_sock.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/nl80211.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/hard-interface.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/types.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_input.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/key/af_key.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_queue.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk_queue.h	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_interface.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/xdp_redirect_user.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/cgroup.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/progs/test_lwt_seg6local.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/config	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/tc-testing/tc-tests/filters/tests.json	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/allwinner/sun4i-emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/marvell/mwifiex/wmm.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/mt76.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/phylink.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
include/net/xdp_sock.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/nl80211.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/hard-interface.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/types.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_input.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/key/af_key.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_queue.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk_queue.h	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_interface.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/xdp_redirect_user.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/cgroup.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/progs/test_lwt_seg6local.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/config	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/tc-testing/tc-tests/filters/tests.json	diff1 \|	diff2 \|	blob \| history