asedeno.scripts.mit.edu Git - linux.git/commit

]> asedeno.scripts.mit.edu Git - linux.git/commit

author	David S. Miller <davem@davemloft.net>
	Wed, 27 Apr 2016 19:43:10 +0000 (15:43 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 27 Apr 2016 19:43:10 +0000 (15:43 -0400)
commit	c0cc53162a0644dd57dce5e2fbb9bbafdc57d183
tree	02393c85628c6ec7d0d942e880623b7f37cf3460	tree \| snapshot
parent	8c14586fc320acfed8a0048eb21d1f2e2856fc36	commit \| diff
parent	f28f20da704d399fb1e4d8838ffd697a357d9cc8	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor overlapping changes in the conflicts.

In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.

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

12 files changed:

local clone of linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/port.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/port.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/if_macsec.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history