David S. Miller aef2b45fe4 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Conflicts: net/xfrm/xfrm_policy.c Steffen Klassert says: ==================== This pull request has a merge conflict between commits be7928d20b ("net: xfrm: xfrm_policy: fix inline not at beginning of declaration") and da7c224b1b ("net: xfrm: xfrm_policy: silence compiler warning") from the net-next tree and commit 2f3ea9a95c ("xfrm: checkpatch erros with inline keyword position") from the ipsec-next tree. The version from net-next can be used, like it is done in linux-next. 1) Checkpatch cleanups, from Weilong Chen. 2) Fix lockdep complaints when pktgen is used with IPsec, from Fan Du. 3) Update pktgen to allow any combination of IPsec transport/tunnel mode and AH/ESP/IPcomp type, from Fan Du. 4) Make pktgen_dst_metrics static, Fengguang Wu. 5) Compile fix for pktgen when CONFIG_XFRM is not set, from Fan Du. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-13 23:14:25 -08: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	net: move pskb_put() to core code	2013-11-07 19:28:58 -05:00
xfrm_hash.c	net: allow GFP_HIGHMEM in __vmalloc()	2010-11-21 10:04:04 -08:00
xfrm_hash.h	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
xfrm_input.c	xfrm: checkpatch errors with foo * bar	2014-01-02 07:48:49 +01: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: choose protocol family by skb protocol	2013-08-19 09:39:04 +02:00
xfrm_policy.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2014-01-13 23:14:25 -08:00
xfrm_proc.c	xfrm: checkpatch errors with space	2014-01-02 07:48:48 +01:00
xfrm_replay.c	xfrm: Fix aevent generation for each received packet	2013-09-25 07:32:48 +02:00
xfrm_state.c	{pktgen, xfrm} Introduce xfrm_state_lookup_byspi for pktgen	2014-01-03 07:29:12 +01:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	xfrm: checkpatch erros with space prohibited	2014-01-02 07:48:50 +01:00