diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-09 21:59:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-09 21:59:24 +0200 |
| commit | e800072c18f0d7b89a80fa46dceb3d080c80e09c (patch) | |
| tree | 8da6cb7944762a60ec37594720c1ad2757631c2f /security/integrity/integrity_audit.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
| download | linux-e800072c18f0d7b89a80fa46dceb3d080c80e09c.tar.xz linux-e800072c18f0d7b89a80fa46dceb3d080c80e09c.zip | |
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>
Diffstat (limited to 'security/integrity/integrity_audit.c')
0 files changed, 0 insertions, 0 deletions