From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <luca.boccassi@gmail.com>
Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com
 [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 6958658EC
 for <stable@dpdk.org>; Mon, 30 Jul 2018 18:29:35 +0200 (CEST)
Received: by mail-wr1-f68.google.com with SMTP id h9-v6so13579914wro.3
 for <stable@dpdk.org>; Mon, 30 Jul 2018 09:29:35 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to
 :references:content-transfer-encoding:mime-version;
 bh=Uh28EYhPh3EZAMlWP3aDFrip18cxoGICixfWc8Uo/14=;
 b=l3Yb3oLRMwVnhvycK0z1SRNxmm6Y11/5Mi9LjUjQq3gfGK5D3ImLvwOSPDEMKCi7Em
 mHLiKE72udtCeDyhFQ0YQ8WG+OgR5YAVA8bzxw9h9buiSHWvgpUM0dM8tU3PZI4mMCtB
 qVWZCSce4K7VP9mpkvZioM4uzzMjRFCRk+APx5HyGijlQcToPZCZErqcQAaL1kjJz2/W
 fqqIFvUhWV8qGsWp5dAP2TLvZYzMypq+RXbjYhOoeluxOZzzsa+n8BCXJek2nE6vXlBt
 5e7eFJWt8WNHgBpkY7fnl2BZYL+IXZGeHnFQyWREjkWPJ1YlmkAqUf6WaQaYdCVj7O0Q
 RnrA==
X-Gm-Message-State: AOUpUlEdtuomtuALPS9iVuM05r0bwiXEdr1ugXVwbzw0nzaflx89PAV1
 gllAsnAqeo0ttdUYfYP3Gz8=
X-Google-Smtp-Source: AAOMgpe25vsj5QO4Ctidx9y9HDB/uZiUkzdgubxrVO8F0f2oaXDkfURdk3EhirJPXSboMvOz/9dM5g==
X-Received: by 2002:adf:9d81:: with SMTP id
 p1-v6mr18851851wre.12.1532968175126; 
 Mon, 30 Jul 2018 09:29:35 -0700 (PDT)
Received: from localhost ([2a00:23c5:be94:4600:7b12:f8a0:fd52:f87d])
 by smtp.gmail.com with ESMTPSA id q1-v6sm17862818wrw.42.2018.07.30.09.29.33
 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
 Mon, 30 Jul 2018 09:29:34 -0700 (PDT)
Message-ID: <1532968173.20916.46.camel@debian.org>
From: Luca Boccassi <bluca@debian.org>
To: Christian Ehrhardt <christian.ehrhardt@canonical.com>, dpdk stable
 <stable@dpdk.org>
Date: Mon, 30 Jul 2018 17:29:33 +0100
In-Reply-To: <20180730162447.17661-2-christian.ehrhardt@canonical.com>
References: <20180730162447.17661-1-christian.ehrhardt@canonical.com>
 <20180730162447.17661-2-christian.ehrhardt@canonical.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Mailer: Evolution 3.22.6-1+deb9u1 
Mime-Version: 1.0
Subject: Re: [dpdk-stable] [PATCH 2/2] import: fix duplicate subject lines
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jul 2018 16:29:35 -0000

On Mon, 2018-07-30 at 18:24 +0200, Christian Ehrhardt wrote:
> In some cases like
> =C2=A0 7fa7216ed S mem: fix alignment of requested virtual areas (18.05)
> =C2=A0 d5dd22c9f S mem: fix alignment of requested virtual areas (18.05)
>=20
> The current scripting will loose the former change.
> It will create files based on format-patch and then later on import
> them.
> But due to the same subject line the later exported change will
> override
> the former change.
>=20
> Avoid that issue by using the commit-id as suffix for the filenames
> and
> by that ensuring that they will be unique.
>=20
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
> =C2=A0import-commit | 2 +-
> =C2=A01 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/import-commit b/import-commit
> index 8d0763f..218924e 100644
> --- a/import-commit
> +++ b/import-commit
> @@ -21,7 +21,7 @@ init()
> =C2=A0		exit 1
> =C2=A0	}
> =C2=A0
> -	patch=3D$($GIT format-patch -o $STABLE_DIR $commit -1)
> +	patch=3D$($GIT format-patch --suffix=3D"-$commit.patch" -o
> $STABLE_DIR $commit -1)
> =C2=A0}
> =C2=A0
> =C2=A0# add "[ upstream commit xxxx ]" tag

Acked-by: Luca Boccassi <bluca@debian.org>

--=20
Kind regards,
Luca Boccassi