From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DC1EC433E0 for ; Thu, 4 Jun 2020 06:41:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 705232075B for ; Thu, 4 Jun 2020 06:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727015AbgFDGlw (ORCPT ); Thu, 4 Jun 2020 02:41:52 -0400 Received: from a.mx.secunet.com ([62.96.220.36]:45168 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726248AbgFDGlw (ORCPT ); Thu, 4 Jun 2020 02:41:52 -0400 Received: from localhost (localhost [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 89DE520533; Thu, 4 Jun 2020 08:41:50 +0200 (CEST) X-Virus-Scanned: by secunet Received: from a.mx.secunet.com ([127.0.0.1]) by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3abts2OExfgK; Thu, 4 Jun 2020 08:41:50 +0200 (CEST) Received: from cas-essen-01.secunet.de (201.40.53.10.in-addr.arpa [10.53.40.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by a.mx.secunet.com (Postfix) with ESMTPS id 2744E200AC; Thu, 4 Jun 2020 08:41:50 +0200 (CEST) Received: from mbx-essen-01.secunet.de (10.53.40.197) by cas-essen-01.secunet.de (10.53.40.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 4 Jun 2020 08:41:50 +0200 Received: from gauss2.secunet.de (10.182.7.193) by mbx-essen-01.secunet.de (10.53.40.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 4 Jun 2020 08:41:49 +0200 Received: by gauss2.secunet.de (Postfix, from userid 1000) id 8596231801D7; Thu, 4 Jun 2020 08:41:49 +0200 (CEST) Date: Thu, 4 Jun 2020 08:41:49 +0200 From: Steffen Klassert To: David Ahern CC: Stephen Rothwell , "David S. Miller" , Linux Next Mailing List , Linux Kernel Mailing List , Florian Westphal Subject: Re: linux-next: manual merge of the ipsec-next tree with Linus' tree Message-ID: <20200604064149.GT19286@gauss3.secunet.de> References: <20200511130015.37103884@canb.auug.org.au> <20200602092040.5ef52300@canb.auug.org.au> <6092c5eb-6e50-97bc-90db-4f7a0ca29c6e@gmail.com> <20200604112606.25ffde35@canb.auug.org.au> <8d943a28-2e9f-9c61-9cff-899e907d6b86@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <8d943a28-2e9f-9c61-9cff-899e907d6b86@gmail.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-ClientProxiedBy: cas-essen-01.secunet.de (10.53.40.201) To mbx-essen-01.secunet.de (10.53.40.197) X-EXCLAIMER-MD-CONFIG: 2c86f778-e09b-4440-8b15-867914633a10 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Jun 03, 2020 at 08:55:01PM -0600, David Ahern wrote: > On 6/3/20 7:26 PM, Stephen Rothwell wrote: > > > > And now the net-next tree has been merged into Linus' tree without this fix :-( > > > > I took a look earlier and I think it is fine. Some code was moved around > in ipsec-next and I think the merge is good. I'll run the test cases > later this week and double check. Thanks for the reminder The setting of XFRM_TRANSFORMED moved to xfrm_output() and depends on CONFIG_NETFILTER. So I think the fix is needed. After the merge of the net tree today, I have both conflicting patches patches in the ipsec tree. I'd apply the fix from Stephen unless you say it is not needed.