Re: [edk2-devel] EDK II Maintainers - EDK II CI is now active on edk2/master

["Michael D Kinney" <michael.d.kinney@intel.com>]

Laszlo,

If the dev branch that is being submitted as a PR
contains the merge commit, or that developer use the
one of the github features to rebase, the merge
commit can be introduced.

When a PR is in this state, the developer need to
clean up their history locally and do a forced
push or open a new PR.

In the case, it looks like PatchCheck did a good
job of rejecting a patch series we would not want
added.

Mike

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Monday, March 9, 2020 1:06 PM
> To: Kinney, Michael D <michael.d.kinney@intel.com>;
> devel@edk2.groups.io; sean.brogan@microsoft.com; Bret
> Barkelew <Bret.Barkelew@microsoft.com>; Gao, Liming
> <liming.gao@intel.com>
> Cc: Leif Lindholm (Nuvia address) <leif@nuviainc.com>;
> Andrew Fish <afish@apple.com>
> Subject: Re: [edk2-devel] EDK II Maintainers - EDK II
> CI is now active on edk2/master
> 
> Hello again,
> 
> On 03/08/20 20:53, Kinney, Michael D wrote:
> 
> > This one is failing PatchCheck with a missing Signed-
> off-by
> > 	https://github.com/tianocore/edk2/pull/430
> 
> The lack of signed-off-by is a red herring.
> 
> Ard's pull request
> 
>   https://github.com/tianocore/edk2/pull/430
> 
> consists of four (4) patches, namely from two series
> (in the order as
> listed below):
> 
> * [edk2-devel] [PATCH v4 0/2]
>   ArmPkg/ArmMmuLib: rewrite and improve cache handling
> with MMU off
> 
>   https://edk2.groups.io/g/devel/message/55635
>   http://mid.mail-archive.com/20200307083849.8940-1-
> ard.biesheuvel@linaro.org
> 
> * [edk2-devel] [PATCH 0/2] ArmPkg/ArmMmuLib AARCH64:
> final cleanups
> 
>   https://edk2.groups.io/g/devel/message/55638
>   http://mid.mail-archive.com/20200307091008.14918-1-
> ard.biesheuvel@linaro.org
> 
> These 4 commits (and only these 4 commits) are listed
> correctly in the
> github.com PR.
> 
> However, the raw log at:
> 
>   https://dev.azure.com/tianocore/11ea4a10-ac9f-4e5f-
> 8b13-7def1f19d478/_apis/build/builds/4672/logs/7
> 
> lists five (5) commits:
> 
> > 2020-03-08T19:48:43.0862971Z From ***
> > 2020-03-08T19:48:43.0875497Z  * [new branch]
> master     -> master
> > 2020-03-08T19:48:43.2525842Z Checking git commit:
> d9402e5f21
> > 2020-03-08T19:48:43.2526905Z Merge branch 'master'
> into aarch64-mmulib
> > 2020-03-08T19:48:43.2527217Z The commit message
> format is not valid:
> > 2020-03-08T19:48:43.2527812Z  * Missing Signed-off-
> by! (Note: this must be added by the code contributor!)
> > 2020-03-08T19:48:43.2528444Z
> https://github.com/tianocore/tianocore.github.io/wiki/C
> ommit-Message-Format
> > 2020-03-08T19:48:43.2528710Z
> > 2020-03-08T19:48:43.2528942Z Checking git commit:
> 1ba3cff0dd
> > 2020-03-08T19:48:43.2529237Z ArmPkg/ArmMmuLib
> AARCH64: cosmetic fixups
> > 2020-03-08T19:48:43.2529542Z The commit message
> format passed all checks.
> > 2020-03-08T19:48:43.2529828Z The code passed all
> checks.
> > 2020-03-08T19:48:43.2529997Z
> > 2020-03-08T19:48:43.2530209Z Checking git commit:
> 5883dd0361
> > 2020-03-08T19:48:43.2530582Z ArmPkg/ArmMmuLib
> AARCH64: drop pointless page table memory type check
> > 2020-03-08T19:48:43.2530951Z The commit message
> format passed all checks.
> > 2020-03-08T19:48:43.2531229Z The code passed all
> checks.
> > 2020-03-08T19:48:43.2531399Z
> > 2020-03-08T19:48:43.2531623Z Checking git commit:
> 553c37e1a3
> > 2020-03-08T19:48:43.2531966Z ArmPkg/ArmMmuLib
> AARCH64: invalidate page tables before populating them
> > 2020-03-08T19:48:43.2532320Z The commit message
> format passed all checks.
> > 2020-03-08T19:48:43.2532773Z The code passed all
> checks.
> > 2020-03-08T19:48:43.2532942Z
> > 2020-03-08T19:48:43.2533149Z Checking git commit:
> 60c3f85a6e
> > 2020-03-08T19:48:43.2533450Z ArmPkg/ArmMmuLib
> AARCH64: rewrite page table code
> > 2020-03-08T19:48:43.2533775Z The commit message
> format passed all checks.
> > 2020-03-08T19:48:43.2534052Z The code passed all
> checks.
> 
> Here, the commit with subject "Merge branch 'master'
> into
> aarch64-mmulib" seems like a bogus commit; I have no
> idea where it comes
> from. Our Mergify configuration forbids any kind of
> auto-rebasing or
> actual merging (i.e. creating merge commits, which have
> multiple
> parents), so I don't know why PatchCheck.py even had to
> look at such a
> commit.
> 
> The 4 actual patches passed "PatchCheck.py".
> 
> I'm going to pick up Ard's patches from the list now,
> afresh (they have
> all been reviewed by Leif), and submit a brand new PR
> with them.
> 
> Thanks
> Laszlo