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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 2DF15C54FCB for ; Wed, 22 Apr 2020 15:31:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14BB12082E for ; Wed, 22 Apr 2020 15:31:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726371AbgDVPbp convert rfc822-to-8bit (ORCPT ); Wed, 22 Apr 2020 11:31:45 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:35092 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725980AbgDVPbo (ORCPT ); Wed, 22 Apr 2020 11:31:44 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-266-6-BEt8NvMfe0d5ySJvE5tw-1; Wed, 22 Apr 2020 11:31:39 -0400 X-MC-Unique: 6-BEt8NvMfe0d5ySJvE5tw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B218A8017F5; Wed, 22 Apr 2020 15:31:38 +0000 (UTC) Received: from bistromath.localdomain (ovpn-112-35.ams2.redhat.com [10.36.112.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 019A65D714; Wed, 22 Apr 2020 15:31:37 +0000 (UTC) Date: Wed, 22 Apr 2020 17:31:36 +0200 From: Sabrina Dubroca To: Steffen Klassert Cc: netdev@vger.kernel.org Subject: Re: [PATCH ipsec-next v2 2/2] xfrm: add IPv6 support for espintcp Message-ID: <20200422153136.GA4098331@bistromath.localdomain> References: <58b84b2af566138279348470b7ad27a8b9650372.1587484164.git.sd@queasysnail.net> <20200422110541.GZ13121@gauss3.secunet.de> MIME-Version: 1.0 In-Reply-To: <20200422110541.GZ13121@gauss3.secunet.de> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: queasysnail.net Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 2020-04-22, 13:05:41 +0200, Steffen Klassert wrote: > On Tue, Apr 21, 2020 at 06:04:23PM +0200, Sabrina Dubroca wrote: > > This extends espintcp to support IPv6, building on the existing code > > and the new UDPv6 encapsulation support. Most of the code is either > > reused directly (stream parser, ULP) or very similar to the IPv4 > > variant (net/ipv6/esp6.c changes). > > > > The separation of config options for IPv4 and IPv6 espintcp requires a > > bit of Kconfig gymnastics to enable the core code. > > > > Signed-off-by: Sabrina Dubroca > > This patch does not apply on top of patch 1/2: > > git am -s ~/Mail/todo-ipsec-next > Applying: xfrm: add support for UDPv6 encapsulation of ESP > Applying: xfrm: add IPv6 support for espintcp > error: patch failed: net/xfrm/espintcp.c:416 > error: net/xfrm/espintcp.c: patch does not apply > Patch failed at 0002 xfrm: add IPv6 support for espintcp > > Can you please doublecheck this? *facepalm* I had the sk_destruct fix in my branch when I exported those patches, so git format-patch exported a patch with slightly different offsets. Sorry for the mess, I'll post a v3 that applies correctly on ipsec-next. -- Sabrina