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

Browse source

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>

...

This commit is contained in:

David S. Miller 2016-04-27 15:43:10 -04:00

parent 8c14586fc3 f28f20da70

commit c0cc53162a

137 changed files with 1416 additions and 698 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

include/uapi/asm-generic/unistd.h

View file

4

include/uapi/linux/if_macsec.h

View file