From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3CF6DA0032 for ; Fri, 24 Jun 2022 16:17:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A177400EF; Fri, 24 Jun 2022 16:17:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 587BE400EF for ; Fri, 24 Jun 2022 16:17:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656080269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p2nX84Muj+7LBh3ObBTLywM8AdyMSA63Om1cWDgIkpk=; b=GoHLr2WvJ3ExyXWdatIIFdjFw83GfB3s3eQqx5AwA+9ZbkfKLLSTH0dAlY7sKkybCnH1Nu Bh033BOvuG+nhNxKklFTYSPDoQjZ807H98LlyfjJDWkJui7nkvP3rtec7rwJfw4WSMzBTs ZoT8ub/uw+4I7xKsizZP9NJsNJL4fhA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-674-PC1HCOcZO02MaxDjYAxBIA-1; Fri, 24 Jun 2022 10:17:26 -0400 X-MC-Unique: PC1HCOcZO02MaxDjYAxBIA-1 Received: by mail-wm1-f71.google.com with SMTP id ay28-20020a05600c1e1c00b0039c5cbe76c1so3140494wmb.1 for ; Fri, 24 Jun 2022 07:17:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:references:from:cc:subject:in-reply-to :content-transfer-encoding; bh=p2nX84Muj+7LBh3ObBTLywM8AdyMSA63Om1cWDgIkpk=; b=X10vP8dIMRAp8Hi610iZcVEZ1K0rBj0voUQcdNTei9AUO2JgjphVM/KwOTaO7UI+/h RHaC58FN7ww4okbW+zLTviBrzmBWcfkFJvwfXKkONVY7w+NHf6ePedPSztLNpXy9ixaq XXcQSTW9T6gPzi4kVp8q1h24ZHKd4iXbjNgxXbBGYfM7NpwMfnMl6Z2C5sR6zst5cNJD 6hD2nSzYvMJE6twQi63IaNiLrbGvK2GptFM/6Gd3Ttpphr/uUjr1YB+QmKehOg66FtDP 7Qnye/tc/ZJ1yAt5ydqjC5moj2VwqLqUqLWb2z6UnUXxPRL2emKNU+a+X3469sfosMmw 6alQ== X-Gm-Message-State: AJIora/glDdYduckX892WOs1OrLJlFPOVOk/GyA06lFHN/fczxPEfc6D vlp0euN1NbSXWA21j6bDStnVyRCjEaloealE4Z+MiDVDAXbls6BHQWUa3FEhhffS0FXmE2eEom6 EbL2leyk= X-Received: by 2002:a05:6000:1683:b0:21b:93b0:898f with SMTP id y3-20020a056000168300b0021b93b0898fmr13384584wrd.662.1656080232544; Fri, 24 Jun 2022 07:17:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1snXZ0+2pmMAmhUU3inGcOIfNpo3GOw8jFmzOHhWmM4Ang6rAqPO2gp2jTgvN8/didD5l6xbg== X-Received: by 2002:a05:6000:1683:b0:21b:93b0:898f with SMTP id y3-20020a056000168300b0021b93b0898fmr13384562wrd.662.1656080232263; Fri, 24 Jun 2022 07:17:12 -0700 (PDT) Received: from [192.168.0.36] ([78.17.181.1]) by smtp.gmail.com with ESMTPSA id d11-20020a5d6dcb000000b0020e6ce4dabdsm2316635wrz.103.2022.06.24.07.17.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jun 2022 07:17:11 -0700 (PDT) Message-ID: <03c7227d-94cb-0335-02a1-807dc0599594@redhat.com> Date: Fri, 24 Jun 2022 15:17:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 To: =?UTF-8?Q?Niklas_S=c3=b6derlund?= References: <20220621100223.1148243-1-ktraynor@redhat.com> From: Kevin Traynor Cc: dpdk stable , peng.zhang@corigine.com Subject: Re: please help backporting some patches to stable release 21.11.2 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi Niklas, On 22/06/2022 11:48, Niklas Söderlund wrote: > Hi Kevin, > > Thanks for your backporting efforts. > > On 2022-06-21 11:02:23 +0100, Kevin Traynor wrote: >> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size > > This patch was submitted [1] with a 'Depends-on' on tag, on patch [2] > that is now upstream as, > > commit 733afb244d304839 ("net/nfp: update how max MTU is read") > > We have verified that the commits cherry-picked in order to the backport > branch applies as-is. Unfortunately we have a fix in dpdk-next-net for > the fix (with a Fixes tag) that needs to be considered. > > commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz") > > In summary for this backport the following upstream commits needs to be > backported (all or none), in order: > > commit 733afb244d304839 ("net/nfp: update how max MTU is read") > commit 417be15e5f1117c3 ("net/nfp: make sure MTU is never larger than mbuf size") > from dpdk-next-net: Adding the updated commit details in case we are trying to remember what we did in the future: > commit f1619c874873a21d ("net/nfp: fix configure by providing initial flbufsz") This commit ^ merged in dpdk main branch as: commit 5c305e218f15552d828e10293d19d9a06c4747f4 Author: Peng Zhang Date: Wed Jun 15 12:14:17 2022 +0200 net/nfp: fix initialization > > My question is how would you prefer I handle this? Shall I create a > backport patch with all of them squashed, create a backport series with > the patches and send it out, or would you prefer to cherry-pick the > commits yourself, or something else? > > I'm sorry for this messy backport. > No problems, thanks for the detailed explanation. I've queued all three patches in that order on my 21.11 branch [0]. I will push to the dpdk.org 21.11 branch with the next batch of backports in the coming days. thanks, Kevin. [0] fe2cddeb08 net/nfp: update how max MTU is read 1c770fda6f net/nfp: make sure MTU is never larger than mbuf size bf7aa26ddd net/nfp: fix initialization > 1. https://patchwork.dpdk.org/project/dpdk/patch/20220511011553.2905582-1-peng.zhang@corigine.com/ > 2. https://patchwork.dpdk.org/project/dpdk/patch/20220420134638.24010-1-walter.heymans@corigine.com/ >