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 551E8A0C47 for ; Tue, 10 Aug 2021 17:41:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4F83E4114F; Tue, 10 Aug 2021 17:41:10 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 3B6CD411C5 for ; Tue, 10 Aug 2021 17:41:08 +0200 (CEST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 1870F3F0A4 for ; Tue, 10 Aug 2021 15:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610068; bh=/whyc5SJVzk0GUA29667S1TTLzUQCzQRV8hj5O/wZR8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oHCmG8J27VOYXPYePBMm4SxLvrbLMrH0Gn2hPTw8lfrAoOGv8emC1XmrYkC8Pj9M5 Zne75CKzgruKaEH1vOiBfNXjB/kGrF5QI8uHXj+5+jSGoi2vJJoU98RODToLXukLNh C7NVWwPXRW8k80IbuYJKQNPt1KEJIT7NDEMuv9vkVRrZ4bDK3Z2zB1GuNpkIDQ4EV2 34XvovR1JkQXWAlfqNOt3Vi8N8DW0GlAzd4QfCP/jCo7hsv7+5EcJQReYLldbVA2j9 maaw3alHi1oX6Q6dwTWKVVMEIFV7cQnFZhzWv7R/zVhVdJKT5hxlRArUy06047h6KT Ewg+6ZsD3we4w== Received: by mail-ej1-f71.google.com with SMTP id gg1-20020a170906e281b029053d0856c4cdso5734103ejb.15 for ; Tue, 10 Aug 2021 08:41:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/whyc5SJVzk0GUA29667S1TTLzUQCzQRV8hj5O/wZR8=; b=G7gdhZ1Z+weq9BIw0I4uSL8Og/h12jpXHCh2SxDZxN8h8kI1wcTxNCv3bR5ZgJvRWX NkLNPvnQkYp2l6U9SHcFAmLGUOTxWfhIMKXmiWDTCIs6ADHCrmRz7zNCpB3tS1IjQ5VZ tIRP1LAkYyQH9GceT74fdQh9K+fAbXlI/TYqw1UutU3l0mwoZ4QGELnQHbPwmoag7hmo /DYG8WFsqlQcEupQvH9snNVa9EL9clvwEe0MPbCX545JsMYVxl5MP5y8zSSYowRp8WL6 EBeOnsm1s7P0wUggNagGAogKrIja313tzshCfmpe/1cUtrnQMmpcQrlcum+r/zNoZaQF sJQA== X-Gm-Message-State: AOAM531VFfXNCxR/HGM6ZMvl1WtxHjbkv/I3Qfz6joz0JK8BXkR53nbx s93THWKkQXSerqQw0nJX9vGK/Nb2iw1uXtGm/eET9Y9ybot6IOHs1frU3fxCQOKgbolhbNX8yUS b3hpIub90Ze3ImqsSXrd/S1uR X-Received: by 2002:a05:6402:35d2:: with SMTP id z18mr5790698edc.282.1628610067815; Tue, 10 Aug 2021 08:41:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKjGO1B9wqvQQ5wQHUNT1m4IcF7+AxEdHkapnCIWU+U9tjmOxsGJ00dZlkMm7iWFRcWmJUvA== X-Received: by 2002:a05:6402:35d2:: with SMTP id z18mr5790673edc.282.1628610067597; Tue, 10 Aug 2021 08:41:07 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id r19sm2113142edd.49.2021.08.10.08.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:41:06 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Thomas Monjalon Cc: dpdk stable Date: Tue, 10 Aug 2021 17:38:53 +0200 Message-Id: <20210810154022.749358-13-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'devtools: fix file listing in maintainers check' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/4406ca174cebbe080afa5b8d901ce5dab451045d Thanks. Christian Ehrhardt --- >From 4406ca174cebbe080afa5b8d901ce5dab451045d Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 15 Jun 2021 14:49:49 +0200 Subject: [PATCH] devtools: fix file listing in maintainers check [ upstream commit 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b ] When having multiple working trees, the main one has a .git directory while attached trees have a .git file. Thus the git check should work for both file and directory. In the case there is no working tree (.git not readable), the command "find" is used and should be able to list paths with wildcards. Wildcards work only as shell expansion in the case of file paths, so the quotes must be removed. Fixes: 27c2ce563216 ("maintainers: start a Linux-style file") Signed-off-by: Thomas Monjalon --- devtools/check-maintainers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh index 85a300f0a0..49d38fbf13 100755 --- a/devtools/check-maintainers.sh +++ b/devtools/check-maintainers.sh @@ -15,10 +15,10 @@ files () # [ ...] if [ -z "$1" ] ; then return fi - if [ -d .git ] ; then + if [ -r .git ] ; then git ls-files "$1" else - find "$1" -type f | + find $1 -type f | sed 's,^\./,,' fi | # if not ended by / -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.593468325 +0200 +++ 0013-devtools-fix-file-listing-in-maintainers-check.patch 2021-08-10 15:11:12.914637350 +0200 @@ -1 +1 @@ -From 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b Mon Sep 17 00:00:00 2001 +From 4406ca174cebbe080afa5b8d901ce5dab451045d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index df3f740b6e..71697bb352 100755 +index 85a300f0a0..49d38fbf13 100755