git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b05f03b 1504269)

author	David S. Miller <davem@davemloft.net>
	Fri, 4 May 2018 13:58:56 +0000 (09:58 -0400)
committer	David S. Miller <davem@davemloft.net>
	Fri, 4 May 2018 13:58:56 +0000 (09:58 -0400)
commit	a7b15ab887e5b8e9803136b5a4a0008d7a3dea86
tree	ca5342d29badb2a3cce2a353b786c8ab4a993c1e	tree
parent	b05f03b232ab4f8f173eeae291a4c9cd662a6676	commit \| diff
parent	1504269814263c9676b4605a6a91e14dc6ceac21	commit \| diff

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

Overlapping changes in selftests Makefile.

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

17 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcmsysport.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/core/ethtool.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.h	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_progs.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.