[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20200619.130426.2081069133350332173.davem@davemloft.net>
Date: Fri, 19 Jun 2020 13:04:26 -0700 (PDT)
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): ipsec 2020-06-19
From: Steffen Klassert <steffen.klassert@...unet.com>
Date: Fri, 19 Jun 2020 09:43:37 +0200
> 1) Fix double ESP trailer insertion in IPsec crypto offload if
> netif_xmit_frozen_or_stopped is true. From Huy Nguyen.
>
> 2) Merge fixup for "remove output_finish indirection from
> xfrm_state_afinfo". From Stephen Rothwell.
>
> 3) Select CRYPTO_SEQIV for ESP as this is needed for GCM and several
> other encryption algorithms. Also modernize the crypto algorithm
> selections for ESP and AH, remove those that are maked as "MUST NOT"
> and add those that are marked as "MUST" be implemented in RFC 8221.
> From Eric Biggers.
>
> Please note the merge conflict between commit:
>
> a7f7f6248d97 ("treewide: replace '---help---' in Kconfig files with 'help'")
>
> from Linus' tree and commits:
>
> 7d4e39195925 ("esp, ah: consolidate the crypto algorithm selections")
> be01369859b8 ("esp, ah: modernize the crypto algorithm selections")
>
> from the ipsec tree.
>
> Please pull or let me know if there are problems.
Pulled, thanks a lot.
Powered by blists - more mailing lists