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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 17F78C282C3 for ; Fri, 25 Jan 2019 01:23:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E828B218D9 for ; Fri, 25 Jan 2019 01:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728199AbfAYBXc (ORCPT ); Thu, 24 Jan 2019 20:23:32 -0500 Received: from shards.monkeyblade.net ([23.128.96.9]:36392 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726015AbfAYBXc (ORCPT ); Thu, 24 Jan 2019 20:23:32 -0500 Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::bf5]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id D60B5108DA4EC; Thu, 24 Jan 2019 17:23:31 -0800 (PST) Date: Thu, 24 Jan 2019 17:23:29 -0800 (PST) Message-Id: <20190124.172329.1169385591668870966.davem@davemloft.net> To: davejwatson@fb.com Cc: jakub.kicinski@netronome.com, netdev@vger.kernel.org, vakul.garg@nxp.com, borisp@mellanox.com, aviadye@mellanox.com, john.fastabend@gmail.com, daniel@iogearbox.net Subject: Re: [PATCH net-next 1/7] net: tls: Save iv in tls_rec for async crypto requests From: David Miller In-Reply-To: <20190124223428.emnizzj2sb6zuokc@davejwatson-mba.dhcp.thefacebook.com> References: <20190124172146.q4acuud6z35wevm4@davejwatson-mba.dhcp.thefacebook.com> <20190124141452.062d6d36@cakuba.netronome.com> <20190124223428.emnizzj2sb6zuokc@davejwatson-mba.dhcp.thefacebook.com> X-Mailer: Mew version 6.8 on Emacs 26.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Thu, 24 Jan 2019 17:23:32 -0800 (PST) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dave Watson Date: Thu, 24 Jan 2019 22:34:29 +0000 > Later patches touch the same code, so would need to be in both to > avoid merge conflicts. Dave, here is the way you should handle this. Submit this patch for net. Let me know that something you want to submit for net-next depends upon it. I will high-prio my merge to Linus to that I can fast forward net and then merge it into net-next. I will let you know this has happened. Then you can submit the net-next parts on top. Thanks.