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 E5364A056D for ; Tue, 28 Jun 2022 16:20:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA311400D7; Tue, 28 Jun 2022 16:20:32 +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 4BC0C400D7 for ; Tue, 28 Jun 2022 16:20:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656426030; h=from:from:reply-to: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=cYIX66ZEF0E7V1bQaMZYOkaI5GwFSnINZEJYOXirCyw=; b=E9KIgxLIRfNPzsg8QWzV11llPTI1rN/tH0rqcl/Cz0+cixcwTQkYcjxPIkQf/99g5KD/FA c6E+IeFA+D9ekGASxcwRxFbB8NvVBSHhtZemWu9B/OLg0xCOhaEW9olCbgMWglz/YlHhfP CswVVj91Zd8mzkS/0lufPzgu/1MZ1UE= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-hDgZQ6xtM2aFMFYHbZydvA-1; Tue, 28 Jun 2022 10:20:30 -0400 X-MC-Unique: hDgZQ6xtM2aFMFYHbZydvA-1 Received: by mail-wm1-f72.google.com with SMTP id be12-20020a05600c1e8c00b0039c506b52a4so5787190wmb.1 for ; Tue, 28 Jun 2022 07:20:29 -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:from:to:cc:reply-to:references:subject:in-reply-to :content-transfer-encoding; bh=cYIX66ZEF0E7V1bQaMZYOkaI5GwFSnINZEJYOXirCyw=; b=w6QZHM8embLyjtDf2Abo3y5/607pAMP0bZ7nnhkMBw61So+RCwEB9W1Jzzz8u01R0f utstXGoddiHfESm/b7oE835lfGlaRLi3y3ukdWZWMQ2jrPrctBMaPspwFd2QJRVFj3kA Q+ZI08zD9zVYiFOEVPaGUWyL9EKxjmByd5LdeJi3+cq4fOUcg5d6bwa+/QOrF0XWuu37 r/B0sZRrYTj7FqDCRh0KqfKVtDAimM5mN9jHAKQozoLf1OLELC1ArMfQ/5lWVdu7r5xK s0gqirV1CQ2FoS9Liq54RdhV6yr4ItUYdvU03zC74BneS6StHC5rWHzBIwNV2qgFoyRJ UMnA== X-Gm-Message-State: AJIora9HyytHFdG9+beYTdEEF01rDn6nenAZ+dYUlg4se//g6sgqqpN6 d8O9nQ7Xbd3rQRp1ZuvarEsUtk7OSnNn2ALSHh56kvemGh2f4j1jjItK6jZFvrGl/nBOnODh35j /CW8FAaKmiA+cByfyFqI4iHLZMM+8/AZMRYl1EO1t2bsAYyen8l0IBii04XQ= X-Received: by 2002:a05:6000:1888:b0:21c:9a16:5cdd with SMTP id a8-20020a056000188800b0021c9a165cddmr9929621wri.562.1656426028038; Tue, 28 Jun 2022 07:20:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uaN7cb8j/I0Ts5fc1J0OtNXI36oXRHYKE4NZO5IH09z6RcSQvpgOqvZpkbN24sVpWcQI/1BA== X-Received: by 2002:a05:6000:1888:b0:21c:9a16:5cdd with SMTP id a8-20020a056000188800b0021c9a165cddmr9929593wri.562.1656426027727; Tue, 28 Jun 2022 07:20:27 -0700 (PDT) Received: from [192.168.0.36] ([78.17.181.1]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c35cb00b0039c4ba160absm4327134wmq.2.2022.06.28.07.20.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jun 2022 07:20:27 -0700 (PDT) Message-ID: Date: Tue, 28 Jun 2022 15:20:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 From: Kevin Traynor To: dpdk stable Cc: Andrew Rybchenko , Dariusz Sosnowski , Viacheslav Ovsiienko , Luca Boccassi References: <20220624163108.1884382-1-ktraynor@redhat.com> Subject: Re: please help backporting some patches to stable release 21.11.2 In-Reply-To: <20220624163108.1884382-1-ktraynor@redhat.com> 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: , Reply-To: dpdk stable Errors-To: stable-bounces@dpdk.org On 24/06/2022 17:31, 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 Correction, I rebased this one ^. No action is needed, thanks. > 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 > 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 >