From: Steffen Klassert <[email protected]>
Date: Thu, 16 Feb 2017 13:18:34 +0100
> 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.
Pulled, thanks. Please double check that I did the merge conflict
resolution properly.
