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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 17 Feb 2017 10:52:00 +0100 From: Steffen Klassert <steffen.klassert@...unet.com> To: David Miller <davem@...emloft.net> CC: <herbert@...dor.apana.org.au>, <netdev@...r.kernel.org> Subject: Re: pull request (net-next): ipsec-next 2017-02-16 On Thu, Feb 16, 2017 at 10:05:57PM -0500, David Miller wrote: > From: Steffen Klassert <steffen.klassert@...unet.com> > Date: Thu, 16 Feb 2017 13:18:34 +0100 > > > > 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. The resolution is correct, thanks!
Powered by blists - more mailing lists