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 704EDA056D for ; Tue, 28 Jun 2022 16:18:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65CE3400D7; Tue, 28 Jun 2022 16:18:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6DD45400D7 for ; Tue, 28 Jun 2022 16:18:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656425929; 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=HmJu/Loe4/hfQX1iLWps4/RpsFJckoD0ruUasfUMJp8=; b=XBG+Qlyu+LpwbC/YWB/UKwv8ytA4JyzijrsCZmeeU7eh9xpCV8wZ7UlP3gq/aeJ/rIjfvL vioiiFBtZxGXzqocPg4TSGu/cO2yd7tCeSRy2v4rTg8/lynvbHvtDXzSPN5K6cc4atMEgv 7LJeE/N/xM+tqOGXY+dJPp9Uc4565oc= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-655-yo9UnS_xMGuLSA91ogmG9w-1; Tue, 28 Jun 2022 10:18:47 -0400 X-MC-Unique: yo9UnS_xMGuLSA91ogmG9w-1 Received: by mail-wm1-f70.google.com with SMTP id v125-20020a1cac83000000b0039c832fbd02so8935005wme.4 for ; Tue, 28 Jun 2022 07:18:47 -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:cc:references:from:subject:in-reply-to :content-transfer-encoding; bh=HmJu/Loe4/hfQX1iLWps4/RpsFJckoD0ruUasfUMJp8=; b=AMdBDjJHWZddG51iwFNzR042bcXQxTODIfyLUnXVJ4nWiftjw0UyprHwu1YTEN+V+F oIU5yjiCzb7WPwjtyRbvhLTgroVNDJU+6UFWadujiHkg3UrPcieQJohwA6MAUhlpdeAT j+j9VKh2shKO4p1dG8ve0/MNzfI74KzYoHQURsyPfM61y5pcJZCquBvUAAg83H62r0Eg QBf9OiQcvjXK4TKQI12VfcxiVeMbCKGmgdXMJOTsiBfO7Te42+y9MGg0+7OLs7JuUfwp wjLaeckLyQJmlTyI4Y3XHmu8Iza1f1u4Hj3jvitmVGeTidmQcP59SuBvbvFO1ZD2De53 mkxQ== X-Gm-Message-State: AJIora9kTUNVrrjteoWeLJT0zR0RmYc06BiVusgefq6ov4rtsxL6x+By CzFcYeY5adQFPttrq07Og3vbaiFkLIrdLXp5U75KMvEycXpXbKRTpqgru7othG4Q80YruIVEtMq QwsGaRh0= X-Received: by 2002:adf:ffcf:0:b0:21a:3cc0:d624 with SMTP id x15-20020adfffcf000000b0021a3cc0d624mr18069809wrs.164.1656425926535; Tue, 28 Jun 2022 07:18:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t0MN5z053e2WQWL8sDbblcHYSzI5rukbmNe2/UYnpSbz6T6i/ULOB6pnIVuO4t2ETgwhpxNw== X-Received: by 2002:adf:ffcf:0:b0:21a:3cc0:d624 with SMTP id x15-20020adfffcf000000b0021a3cc0d624mr18069792wrs.164.1656425926328; Tue, 28 Jun 2022 07:18:46 -0700 (PDT) Received: from [192.168.0.36] ([78.17.181.1]) by smtp.gmail.com with ESMTPSA id n14-20020a05600c500e00b003a03564a005sm19343345wmr.10.2022.06.28.07.18.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jun 2022 07:18:45 -0700 (PDT) Message-ID: Date: Tue, 28 Jun 2022 15:18:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 To: Rahul Lakkireddy , dpdk stable Cc: Luca Boccassi References: <20220624163108.1884382-1-ktraynor@redhat.com> From: Kevin Traynor 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: 7bit 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 On 27/06/2022 14:39, Rahul Lakkireddy wrote: > On Friday, June 06/24/22, 2022 at 17:31:08 +0100, Kevin Traynor wrote: >> Hi commit authors (and maintainers), >> >> Despite being selected by the DPDK maintenance tool ./devtools/git-log-fixes.sh >> I didn't apply following commits from DPDK main to 21.11 >> stable branch, as conflicts or build errors occur. >> >> Can authors check your patches in the following list and either: >> - Backport your patches to the 21.11 branch, or >> - Indicate that the patch should not be backported >> >> Please do either of the above by 07/01/22. >> >> You can find the a temporary work-in-progress branch of the coming 21.11.2 >> release at: >> https://github.com/kevintraynor/dpdk-stable >> It is recommended to backport on top of that to minimize further conflicts or >> misunderstandings. >> >> Some notes on stable backports: >> >> A backport should contain a reference to the DPDK main branch commit >> in it's commit message in the following fashion: >> [ upstream commit ] >> >> For example: >> https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb >> >> When sending the backported patch, please indicate the target branch in the >> subject line, as we have multiple branches, for example: >> [PATCH 21.11] foo/bar: fix baz >> >> With git format-patch, this can be achieved by appending the parameter: >> --subject-prefix='PATCH 21.11' >> >> Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org". >> >> FYI, branch 21.11 is located at tree: >> https://git.dpdk.org/dpdk-stable >> >> Thanks. >> >> Kevin >> >> --- >> These commits have non-trivial conflicts while applying to 21.11 branch: >> 4c1a91b21f Arek Kusztal crypto/qat: fix cleanup function default behaviour >> 5b4d317d83 Arek Kusztal crypto/qat: fix missing copy guards in asym mod >> d2fa2632a4 Dariusz Sosnowski net/mlx5: fix RSS hash types adjustment >> a31c9f970d David Marchand net/cnxk: fix crash in IPsec telemetry >> 6cef22dcfe Harman Kalra net/cnxk: fix PFC class disabling >> 6f065d1539 Li Zhang vdpa/mlx5: fix maximum number of virtqs >> b2c5ff1bd9 Nithin Dabilpuram common/cnxk: fix mbox structs to avoid unaligned access >> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device >> e2819fea94 Nithin Dabilpuram net/cnxk: fix multi-segment extraction in vwqe path >> 2e668c547f Nithin Dabilpuram net/cnxk: fix roundup size with transport mode >> 417be15e5f Peng Zhang net/nfp: make sure MTU is never larger than mbuf size >> 694c75e8e3 Rahul Lakkireddy test/crypto: fix build with optimization=1 > > Please skip this commit. Looks like its dependent commit: > > d02c6bfcb99a ("test/crypto: add ESN and antireplay cases") > > is not available in DPDK v21.11. It seems to be available from DPDK > v22.03, instead. > will do, thanks for checking. >> c65e343c14 Stanislaw Kardach ci: enable C++ check for Arm and PPC >> f75dd6d3b1 Stanislaw Kardach config: fix C++ cross compiler for Arm and PPC >> 174f2f3512 Sunil Kumar Kori common/cnxk: add PFC support for VF >> 95af59b7ad Yajun Wu vdpa/mlx5: workaround VAR offset within page >> >> These commits apply cleanly to 21.11 branch but cause build errors: >> aa802b1023 Bruce Richardson dma/idxd: fix AVX2 in non-datapath functions >> (^ commit causes build error on OBS CentOS7. No need to rework, can take >> when fix arives on DPDK main) >> >> 14124e48a3 Nithin Dabilpuram net/cnxk: fix hotplug detach for first device >> 485df8847a Chengwen Feng ethdev: clarify null location case in xstats get >> 45a192b2b4 Stephen Hemminger sched: fix floating point math >> 87ecdd9e7f Timothy McDaniel event/dlb2: improve enqueue efficiency >> > > Thanks, > Rahul >