From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jordan.l.justen@intel.com>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by ml01.01.org (Postfix) with ESMTP id 06BE91A1E0B
 for <edk2-devel@lists.01.org>; Tue, 16 Aug 2016 00:04:18 -0700 (PDT)
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
 by orsmga101.jf.intel.com with ESMTP; 16 Aug 2016 00:04:17 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.28,529,1464678000"; d="scan'208";a="1026138074"
Received: from msriniv1-mobl2.amr.corp.intel.com (HELO localhost)
 ([10.252.142.133])
 by fmsmga001.fm.intel.com with ESMTP; 16 Aug 2016 00:04:17 -0700
MIME-Version: 1.0
To: Eric Dong <eric.dong@intel.com>,  edk2-devel@lists.01.org
Message-ID: <147133105679.1449.12789083525217772059@jljusten-ivb>
From: Jordan Justen <jordan.l.justen@intel.com>
In-Reply-To: <1470967788-23324-1-git-send-email-eric.dong@intel.com>
Cc: "Cecil Sheng" <cecil.sheng@hpe.com>, "Liming Gao" <liming.gao@intel.com>
References: <1470967788-23324-1-git-send-email-eric.dong@intel.com>
User-Agent: alot/0.3.7
Date: Tue, 16 Aug 2016 00:04:16 -0700
Subject: Re: [Patch] MdePkg: Fix guid conflict.
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Aug 2016 07:04:18 -0000
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Some notes for future reference, since this is already committed.

I think subject should have been something like:

MdePkg/ImageDecoder: Fix GUID conflict with PCI Root Bridge Protocol

When browsing commits with just the subject line, you should have a
good idea of what the commit is about. (For example: gitk, or tig, or
git log --oneline)

On 2016-08-11 19:09:48, Eric Dong wrote:
> -  { 0x2f707ebb, 0x4a1a, 0x11d4, {0x9a,0x38,0x00,0x90,0x27,0x3f,0xc1,0x4d=
}}
> +  {0x9e66f251, 0x727c, 0x418c, { 0xbf, 0xd6, 0xc2, 0xb4, 0x25, 0x28, 0x1=
8, 0xea }}

Should have a space before 0x9e66f251.

>    ## Include/Guid/MemoryOverwriteControl.h
>    gEfiMemoryOverwriteControlDataGuid =3D { 0xe20939be, 0x32d4, 0x41be, {=
0xa1, 0x50, 0x89, 0x7f, 0x85, 0xd4, 0x98, 0x29 }}
> -  =

> +
>    ## Include/IndustryStandard/MemoryOverwriteRequestControlLock.h
>    gEfiMemoryOverwriteRequestControlLockGuid =3D { 0xBB983CCF, 0x151D, 0x=
40E1, {0xA0, 0x7B, 0x4A, 0x17, 0xBE, 0x16, 0x82, 0x92}}
>  =

> @@ -1384,7 +1384,7 @@
>  =

>    ## Include/Protocol/TrEEProtocol.h
>    gEfiTrEEProtocolGuid           =3D {0x607f766c, 0x7455, 0x42be, { 0x93=
, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f }}
> -  =

> +

I don't think we need to update lines that are unrelated to the patch.
It just distracts from the change.

-Jordan