git.openwrt.org Git - openwrt/staging/blogic.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 26 Apr 2019 03:52:29 +0000 (23:52 -0400)
committer	David S. Miller <davem@davemloft.net>
	Fri, 26 Apr 2019 03:52:29 +0000 (23:52 -0400)
commit	8b4483658364f05b2e32845c8f445cdfd9452286
tree	4734ef83378b1e90475ec4776ac72dfe16a7249b	tree \| snapshot
parent	c049d56eb219661c9ae48d596c3e633973f89d1f	commit \| diff
parent	cd8dead0c39457e58ec1d36db93aedca811d48f1	commit \| diff

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

Two easy cases of overlapping changes.

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

22 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/sysctl_net_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/local_object.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/netfilter/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/netfilter/nft_nat.sh	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/sysctl_net_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/local_object.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/netfilter/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/netfilter/nft_nat.sh	diff1 \|	diff2 \|	blob \| history