git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	aae839184097c60331d6a69c92d5994bbe42b15e
tree	02393c85628c6ec7d0d942e880623b7f37cf3460	tree \| snapshot
parent	9d6e8d441cbd29cf30849b09620bcd8d2af828fb	commit \| diff
parent	8f2e7b8e5afa7c2785cc3cff4411810a0ba49be2	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:

Linux Kernel Source Tree.

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