netdev - Re: pull request (net-next): ipsec-next 2017-02-16

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 16 Feb 2017 22:05:57 -0500 (EST)
From:   David Miller <davem@...emloft.net>
To:     steffen.klassert@...unet.com
Cc:     herbert@...dor.apana.org.au, netdev@...r.kernel.org
Subject: Re: pull request (net-next): ipsec-next 2017-02-16

From: Steffen Klassert <steffen.klassert@...unet.com>
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.