From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 177EF1E2B for ; Mon, 20 Aug 2018 20:04:11 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id 20-v6so7736995wrb.12 for ; Mon, 20 Aug 2018 11:04:11 -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; bh=TOXrPb/wl9OJMKCxkrpXiqjr5zmOyblpv/ravuuG/QI=; b=F2ESuFyQ6WMponIunr/52DxkdGq6QIsjBT6K1dBTCx/Zf2K6PhQTrdQAAk73ccXK8j jvalowNDRqz/7paYpL8LZED36Dwoq5ziXCR55c7nGBTa9fypK3CJwKPH4JHq08oGG7H2 9uUxQPmn4beTV83CQ4OX5F8lscMxbK3oe1gAZU6ZLlpJDgj3Vgri5rR3tRxComWHmu2w fQwhR7/DWV+TzruA3o8SGYutZQKG9JH4ledSWJ2VxkL/vp3jsjAt1RRkfhkM0y/Xk1Vx g9c6utqGz5X/7MPQFL1Npp19dBUwYIjlL3OW0LzkBcmET01/bEhRx9J5313JiyQvVtGG bkJQ== X-Gm-Message-State: AOUpUlHvWbo8RWgZuXUcTVrwrAx/V1Bayhr6EKAuyhDfIX3HHBp7qhyp GK/ODtPS+B5WLc6uFAFjYrQfgpYY X-Google-Smtp-Source: AA+uWPzYdsSmpPLGMV5PJI/Ce4vpMloM78U9z4FMbOwmJ+4Mfl0KPXeIDvOwP8DGrM6tvK/XZbn8fw== X-Received: by 2002:adf:91e5:: with SMTP id 92-v6mr30041657wri.124.1534788250433; Mon, 20 Aug 2018 11:04:10 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id 88-v6sm2290461wrf.95.2018.08.20.11.04.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 11:04:08 -0700 (PDT) From: bluca@debian.org To: stable@dpdk.org Cc: yskoh@mellanox.com, christian.ehrhardt@canonical.com, ktraynor@redhat.com, Luca Boccassi Date: Mon, 20 Aug 2018 19:03:57 +0100 Message-Id: <20180820180357.26095-1-bluca@debian.org> X-Mailer: git-send-email 2.18.0 Subject: [dpdk-stable] [PATCH stable-scripts] Add diff-of-diff below backported patch to 2-notice X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2018 18:04:11 -0000 From: Luca Boccassi We noticed that it's not clear if a patch is cleanly cherry-picked or if it gets adjusted due to merge conflicts. This change will add to the backport notice email a diff-of-diffs, and a note asking the developer/maintainer to review it. This way it the work we do will be more transparent. Signed-off-by: Luca Boccassi --- compose-notice | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/compose-notice b/compose-notice index e5996f4..95260bd 100644 --- a/compose-notice +++ b/compose-notice @@ -41,6 +41,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 $(date --date="+2 days" "+%D"). So please shout if anyone has objections. $(cat notice-more 2>/dev/null | grep -v "^#") +Also note that after the patch there's a diff of the upstream commit vs the patch applied +to the branch. If the code is different (ie: not only metadata diffs), due for example to +a change in context or macro names, please double check it. + Thanks. ${SIGNATURE} @@ -54,6 +58,19 @@ construct_patch() cat $patch } +construct_diff_of_diff() +{ + upstream_commit=$(grep "\[ upstream commit " $patch | sed "s/\[ upstream commit \(.*\) \]/\1/") + if [ -n "$upstream_commit" ] + then + echo "---" + echo " Diff of the applied patch vs upstream commit (please double-check if non-empty:" + echo "---" + $GIT format-patch --stdout -1 $upstream_commit | diff -Naur - $patch + fi +} + construct_header construct_notice construct_patch +construct_diff_of_diff -- 2.18.0