| commit | e800072c18f0d7b89a80fa46dceb3d080c80e09c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon May 09 15:59:24 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon May 09 15:59:24 2016 -0400 |
| tree | 8da6cb7944762a60ec37594720c1ad2757631c2f | |
| parent | e8ed77dfa90dd79c5343415a4bbbfdab9787b35a [diff] | |
| parent | b507146bb6b9ac0c0197100ba3e299825a21fed3 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>