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 59185A0C4C for ; Mon, 12 Jul 2021 15:11:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 533894069D; Mon, 12 Jul 2021 15:11:34 +0200 (CEST) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 09E344069D for ; Mon, 12 Jul 2021 15:11:33 +0200 (CEST) Received: by mail-wr1-f46.google.com with SMTP id t5so11693214wrw.12 for ; Mon, 12 Jul 2021 06:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=11fTzr/hzrRp6ze2iEXzkF6AY5ZafG1T0UToLuTeGYI=; b=KEs59qfS4o3KL6U/4zMD9YzlQIGhp7rPEbR5V5SdDhjofZPWxOihF+vySXtHCk8L1s bGTDZZNmzgJ9pLRIp36NjJ+jgsdO+HHGL8+Yyz/mQwBBHjkfUF/mPJFWgQftSHouwOm+ fZLrxVqX64hFnFivdlwi7KNQSqUnKMDaJUSEOu1tfbHalZzoR2MTP+n+ElsCrbALK8lt QQ+5S6cSloimPRhmmOjejyTZkTw4ppLbhfnb72g7Rws5rT9fq1zG0EDhJCe57GtRHOnK tio/uyIx3sYkJLupEGGW/TJVPTmVe1uZ9BChOzcxfFaU6iAK2qbp0PjECz3vPdvKcA5R 8f/w== 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=11fTzr/hzrRp6ze2iEXzkF6AY5ZafG1T0UToLuTeGYI=; b=DrW7ZFZX1zuHboMb5auiUn4tBW4mV4hQ3FbAduFnWVbuosV43Twyfss7ZiwaXrlRnl CLcwoSgGx1VG/bRuimYY/WIU4Hz8EpG46IoUS74nSiTBiUSrp+HTZx4Zzas2pSVEJD4Q AHmrSLbyVnEFuMcZqZ66KkopJVMPm8/s9bfegO1rufSHGEnRUOPhhvYhUthHYI9FJTT/ NlnP7pLG6aQPP1++1rzogV8DqEhvSNaqE6q9537I/toFc2sRWwcb/y1liiCyDuwmiXA5 kBPtcWPVYAcWrSKEEXmojWS4IpAsOEM6YJYgDG8KeWjZt7fYqmAXTtaH7n1kLFEw67aA MGGw== X-Gm-Message-State: AOAM5318j+fxyOTLn9QNTP15ZgpMhPRBq+r5MvQvsaOh0A9nr30ge/Pc 1pickTkv/Ed22D01g1Btf5XTQ/fknuI8Ig== X-Google-Smtp-Source: ABdhPJwBlHQsKSavmnTyItXvFYQ4SBSgflk9mcPqeovKSMudCtPwq+Vx2+Yugk8eA51qpeNVe0guYA== X-Received: by 2002:a5d:4573:: with SMTP id a19mr21553300wrc.346.1626095492828; Mon, 12 Jul 2021 06:11:32 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id 11sm3486780wmo.10.2021.07.12.06.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:11:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: dpdk stable Date: Mon, 12 Jul 2021 14:04:24 +0100 Message-Id: <20210712130551.2462159-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d07ee666e60795b12a235089e053f622e860b745 Thanks. Luca Boccassi --- >From d07ee666e60795b12a235089e053f622e860b745 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 df3f740b6e..71697bb352 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:38.269726401 +0100 +++ 0029-devtools-fix-file-listing-in-maintainers-check.patch 2021-07-12 13:41:36.290118444 +0100 @@ -1 +1 @@ -From 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b Mon Sep 17 00:00:00 2001 +From d07ee666e60795b12a235089e053f622e860b745 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org