David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

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

2016-09-12 15:52:44 -07:00

..

Kconfig

net/xfrm: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:40:03 -08:00

Makefile

xfrm: make xfrm_algo.c a module

2012-05-15 13:13:34 -04:00

xfrm_algo.c

xfrm: use IS_ENABLED() instead of checking for built-in or module

2016-09-10 21:19:11 -07:00

xfrm_hash.c

net: allow GFP_HIGHMEM in __vmalloc()

2010-11-21 10:04:04 -08:00

xfrm_hash.h

xfrm: hash prefixed policies based on preflen thresholds

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

xfrm_input.c

net/xfrm_input: fix possible NULL deref of tunnel.ip6->parms.i_key

2016-08-11 13:15:57 +02:00

xfrm_ipcomp.c

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

2013-11-04 13:48:30 -05:00

xfrm_output.c

xfrm: Reset encapsulation field of the skb before transformation

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

xfrm_policy.c

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

2016-09-12 15:52:44 -07:00

xfrm_proc.c

net: clean up snmp stats code

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

xfrm_replay.c

xfrm: constify xfrm_replay structures

2016-08-10 11:18:49 +02:00

xfrm_state.c

xfrm: state: remove per-netns gc task

2016-08-24 13:16:06 +02:00

xfrm_sysctl.c

net: xfrm: Change u32 sysctl entries to use proc_douintvec

2016-09-07 23:17:53 -07:00

xfrm_user.c

xfrm: get rid of another incorrect WARN

2016-07-27 13:09:00 +02:00