Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp2528030rdh; Sun, 29 Oct 2023 22:24:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHiBBsfZp57nWr6EaSrXtKPZorcJJfbyHlT/m2/Glcm94RoMM7m1coYeWahhJrIPIYZqdv X-Received: by 2002:a05:6870:40c1:b0:1e9:9be0:e8b0 with SMTP id l1-20020a05687040c100b001e99be0e8b0mr11699049oal.29.1698643454134; Sun, 29 Oct 2023 22:24:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698643454; cv=none; d=google.com; s=arc-20160816; b=CBWALMUARtqCgMfG3gTXheA7NxQXF4CUAQVyoUXO420Es50pnOJjrZ/d6rYRfBMVux DulcO8xUtUV0DrG+H6+/abb8Qnxcehjm99d8rlLBk1//jgq0YDGr8Lp5cc9k6NcXyu9h lGvQOOghbhi2Uam3j9tIJZxbtG8vRFCkpgLieH4F4WkbhwwjeqSJuRfnzsjogbTHR0MM Puxc4OuPFlp4DLnPSaEsU2Lv4kF2PXxoXtDnLwjjvL0l8ZOOKCAjN2FtIdki9k4i3YYl 8meYYfC3o6oC/CYd2ocVMqTMCgd5sTXI4exCsorlmfNgHKCFUn4cH/MZfumHKEtGAtCT JUVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=Jwvak7pqaUm+Fss3402N99Jk7GU6BgWoxXdn4/lfj9c=; fh=eHzwR47ut90s6d/ZOyn2o3TXMblGdIBtgK8D2lpHacs=; b=u94Wln9OBlQbTKUw9bz6JlGyOJd0qH4zw/e99FvkmSd6gTsre1+JXb1ZzCM9tfesXv jcoxe4W4pKe/IYq9Or9NOyudibJzs9OmLXXJXHFRgq4p6QpaOJ59tCpkwVQHd5pxaoj0 4HdDAc8mkJOcPq9WxFwwTG8jQYHSWKoo7/JHir08v+kZsm1BO89yQzfTPElHRK+fqcdY Ed4Ok/5mEF6hyipV/Zmsa2b0ILxZzfLodRAnB6Wid2PuynZl+5yxTbuDPr9MffYQ7Yu3 FHi+V0vGjWTnwjKtTQNHUOci5Id1gs3EM+EgJQhZmpN+dma3Gj0p7h1x9iz2CYWic30o q8uw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z125-20020a633383000000b005b92d41764dsi4451094pgz.794.2023.10.29.22.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 22:24:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 129108055551; Sun, 29 Oct 2023 22:24:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231131AbjJ3FYJ (ORCPT + 99 others); Mon, 30 Oct 2023 01:24:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230488AbjJ3FYI (ORCPT ); Mon, 30 Oct 2023 01:24:08 -0400 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72A8990; Sun, 29 Oct 2023 22:24:05 -0700 (PDT) Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.94.2 #2 (Debian)) id 1qxKkc-00COW1-SZ; Mon, 30 Oct 2023 13:23:47 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Mon, 30 Oct 2023 13:23:53 +0800 Date: Mon, 30 Oct 2023 13:23:53 +0800 From: Herbert Xu To: Stephen Rothwell Cc: David Miller , Jakub Kicinski , Paolo Abeni , Networking , Linux Crypto List , Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Francesco Ruggeri , Salam Noureddine , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the crypto tree Message-ID: References: <20231030155809.6b47288c@canb.auug.org.au> <20231030160953.28f2df61@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231030160953.28f2df61@canb.auug.org.au> X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 29 Oct 2023 22:24:10 -0700 (PDT) On Mon, Oct 30, 2023 at 04:09:53PM +1100, Stephen Rothwell wrote: > > From: Stephen Rothwell > Date: Mon, 30 Oct 2023 15:54:37 +1100 > Subject: [PATCH] fix up for "crypto: ahash - remove crypto_ahash_alignmask" > > interacting with "net/tcp: Introduce TCP_AO setsockopt()s" > > Signed-off-by: Stephen Rothwell > --- > net/ipv4/tcp_ao.c | 6 ------ > 1 file changed, 6 deletions(-) Acked-by: Herbert Xu If we simply apply this patch to the netdev tree then everything should work at the next merge window. But perhaps you could change the patch description to say something like remove the obsolete crypto_hash_alignmask. It's not important though. Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt