diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-30 21:11:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-30 21:24:57 +0200 |
| commit | 7b77d161ce7e480a660692cab079712fc0268ba2 (patch) | |
| tree | b48e40d0e619a1c1a82be374fbd458584a9d6094 /net/atm | |
| parent | hamradio: baycom: remove deprecated IRQF_DISABLED (diff) | |
| parent | {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback (diff) | |
| download | linux-7b77d161ce7e480a660692cab079712fc0268ba2.tar.xz linux-7b77d161ce7e480a660692cab079712fc0268ba2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Conflicts:
include/net/xfrm.h
Simple conflict between Joe Perches "extern" removal for function
declarations in header files and the changes in Steffen's tree.
Steffen Klassert says:
====================
Two patches that are left from the last development cycle.
Manual merging of include/net/xfrm.h is needed. The conflict
can be solved as it is currently done in linux-next.
1) We announce the creation of temporary acquire state via an asyc event,
so the deletion should be annunced too. From Nicolas Dichtel.
2) The VTI tunnels do not real tunning, they just provide a routable
IPsec tunnel interface. So introduce and use xfrm_tunnel_notifier
instead of xfrm_tunnel for xfrm tunnel mode callback. From Fan Du.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm')
0 files changed, 0 insertions, 0 deletions