diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 11:14:25 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 11:14:25 +0400 |
| commit | aef2b45fe459428d1861a74b08f3f57e87411f56 (patch) | |
| tree | c2a4438c1b65afd6f805efe274817b9f04270dae /firmware/edgeport | |
| parent | 2afe02eed1ac565e5ba90254706e67f670ae41a2 (diff) | |
| parent | 6bae919003602729d6f5920315bf71ca78bd9e48 (diff) | |
| download | linux-aef2b45fe459428d1861a74b08f3f57e87411f56.tar.xz | |
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 be7928d20bab
("net: xfrm: xfrm_policy: fix inline not at beginning of declaration") and
da7c224b1baa ("net: xfrm: xfrm_policy: silence compiler warning") from
the net-next tree and commit 2f3ea9a95c58 ("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>
Diffstat (limited to 'firmware/edgeport')
0 files changed, 0 insertions, 0 deletions