git.maquefel.me Git - linux.git/commit

author	David S. Miller <davem@davemloft.net>
	Wed, 17 Apr 2019 18:26:25 +0000 (11:26 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 17 Apr 2019 18:26:25 +0000 (11:26 -0700)
commit	6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b
tree	0a7976054052e793da782c2b7ec34eccfbf66449	tree \| snapshot
parent	cea0aa9cbd5ad4efe267e9487ed5d48d16756253	commit \| diff
parent	fe5cdef29e41c8bda8cd1a11545e7c6bfe25570e	commit \| diff

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

Conflict resolution of af_smc.c from Stephen Rothwell.

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

40 files changed:

.clang-format	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	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_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_input.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fou.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.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_pnet.c	diff1 \|	diff2 \|	blob \| history
net/strparser/strparser.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/fib_tests.sh	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

.clang-format	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	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_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_input.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fou.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.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_pnet.c	diff1 \|	diff2 \|	blob \| history
net/strparser/strparser.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/fib_tests.sh	diff1 \|	diff2 \|	blob \| history