diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-16 21:25:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-16 21:25:49 -0500 |
commit | 99d5ceeea5120dd3ac2f879f4083697b70a1c89f (patch) | |
tree | 2d203cc3f1c8bfbf6e9b156faa0f1d689e1a52ca /kernel/power/snapshot.c | |
parent | 5237b9dde379f9eadd60a9b6310567ce5d307fe8 (diff) | |
parent | 7785bba299a8dc8fe8390a0183dad3cafb3f1d80 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2017-02-16
1) Make struct xfrm_input_afinfo const, nothing writes to it.
From Florian Westphal.
2) Remove all places that write to the afinfo policy backend
and make the struct const then.
From Florian Westphal.
3) Prepare for packet consuming gro callbacks and add
ESP GRO handlers. ESP packets can be decapsulated
at the GRO layer then. It saves a round through
the stack for each ESP packet.
Please note that this has a merge coflict between commit
63fca65d0863 ("net: add confirm_neigh method to dst_ops")
from net-next and
3d7d25a68ea5 ("xfrm: policy: remove garbage_collect callback")
a2817d8b279b ("xfrm: policy: remove family field")
from ipsec-next.
The conflict can be solved as it is done in linux-next.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/power/snapshot.c')
0 files changed, 0 insertions, 0 deletions