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

Browse source

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

...

This commit is contained in:

David S. Miller 2016-05-09 15:59:24 -04:00

parent e8ed77dfa9 b507146bb6

commit e800072c18

148 changed files with 1473 additions and 779 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

lib/stackdepot.c

View file