| commit | c0cc53162a0644dd57dce5e2fbb9bbafdc57d183 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Apr 27 15:43:10 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Wed Apr 27 15:43:10 2016 -0400 |
| tree | 02393c85628c6ec7d0d942e880623b7f37cf3460 | |
| parent | 8c14586fc320acfed8a0048eb21d1f2e2856fc36 [diff] | |
| parent | f28f20da704d399fb1e4d8838ffd697a357d9cc8 [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>