David S. Miller e800072c18 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>

2016-05-09 15:59:24 -04:00

..

Kconfig

…

Makefile

…

xfrm_algo.c

ipsec: Use skcipher and ahash when probing algorithms

2016-01-27 20:36:07 +08:00

xfrm_hash.c

…

xfrm_hash.h

xfrm: hash prefixed policies based on preflen thresholds

2014-09-02 13:29:44 +02:00

xfrm_input.c

xfrm: Fix crash observed during device unregistration and decryption

2016-03-24 14:29:36 -04:00

xfrm_ipcomp.c

…

xfrm_output.c

xfrm: Reset encapsulation field of the skb before transformation

2016-03-17 10:28:44 +01:00

xfrm_policy.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

2015-12-22 16:26:31 -05:00

xfrm_proc.c

net: clean up snmp stats code

2014-05-07 16:06:05 -04:00

xfrm_replay.c

xfrm: Always zero high-order sequence number bits

2015-05-21 06:56:23 +02:00

xfrm_state.c

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

2015-06-01 22:51:30 -07:00

xfrm_sysctl.c

…

xfrm_user.c

xfrm: align nlattr properly when needed

2016-04-23 20:13:25 -04:00