From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75])
 by mx.groups.io with SMTP id smtpd.web09.1714.1659125909058744384
 for <devel@edk2.groups.io>;
 Fri, 29 Jul 2022 13:18:29 -0700
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FCCToOFg;
 spf=pass (domain: kernel.org, ip: 145.40.68.75, mailfrom: ardb@kernel.org)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by ams.source.kernel.org (Postfix) with ESMTPS id 37391B82914
	for <devel@edk2.groups.io>; Fri, 29 Jul 2022 20:18:27 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1325C433C1
	for <devel@edk2.groups.io>; Fri, 29 Jul 2022 20:18:25 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1659125905;
	bh=v8TyWQYLE2pLqGP7yrNA/BYSEJWyqgtk40HcPnJjACw=;
	h=References:In-Reply-To:From:Date:Subject:To:Cc:From;
	b=FCCToOFgak+TVIYP/5T69fprpS0hU0iq5npgdUHnDTmaW4gc4Y80lqYf9ATghWZCB
	 3DqzrJiNQEdS0ACiOOZMfaCnVYS1Amb47w5b2feO6x4h5Nr4FMattZtgXF4/t17gr6
	 /ywueYdPByNXBSpaBUPAvLgBAL1jBvA5fjLzpZKsHgtbj6yUvh76jPPbrrWBRgv8FM
	 Us06zAN7b/KaSkLvzl2hUgOFFsqFu8HIYiMFe2Oy/Q+LGQFb2DCQe+l4IbZlPggw7i
	 KCyp4VeEen+jl9ferJwg7b4jOFkxnZdAYDetc0SdkFjJ9Cpu7zvQ/1Q23iU+qdEUnU
	 y2jHgLoCvD48g==
Received: by mail-oi1-f171.google.com with SMTP id h188so6530352oia.13
        for <devel@edk2.groups.io>; Fri, 29 Jul 2022 13:18:25 -0700 (PDT)
X-Gm-Message-State: AJIora8rt4VCKQ3eV6whv8J3HlE0yYvHJ0LEu3jyQTuIsws/LYucYiSF
	ewQvkOpid4iwFIc1DmyL0SFuNb6eoaVRSRHQNbc=
X-Google-Smtp-Source: AGRyM1vziezlBKmi9wtOTsRmXw0bs0ImU82mqIsajK6qjozLLpHKMN+yuquWO2zXfYejWltBklROoB3iFRgQXlCQ4Uk=
X-Received: by 2002:a05:6808:16ac:b0:33b:32ce:edd8 with SMTP id
 bb44-20020a05680816ac00b0033b32ceedd8mr1357421oib.126.1659125904978; Fri, 29
 Jul 2022 13:18:24 -0700 (PDT)
MIME-Version: 1.0
References: <8c436432-f518-469d-a3f7-425ff3051653@arm.com> <5ac96d33-d9bb-f6fa-e6c1-b17153b02fae@arm.com>
In-Reply-To: <5ac96d33-d9bb-f6fa-e6c1-b17153b02fae@arm.com>
From: "Ard Biesheuvel" <ardb@kernel.org>
Date: Fri, 29 Jul 2022 13:18:14 -0700
X-Gmail-Original-Message-ID: <CAMj1kXFxLckxUNegqFe1BQc0pN7FcQZQkP_i1+VQX-B=5Jx=SQ@mail.gmail.com>
Message-ID: <CAMj1kXFxLckxUNegqFe1BQc0pN7FcQZQkP_i1+VQX-B=5Jx=SQ@mail.gmail.com>
Subject: Re: Incorrect push to edk2-platforms
To: Sami Mujawar <sami.mujawar@arm.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>, edk2-devel-groups-io <devel@edk2.groups.io>, nd <nd@arm.com>, 
	Leif Lindholm <quic_llindhol@quicinc.com>, Michael D Kinney <michael.d.kinney@intel.com>
Content-Type: text/plain; charset="UTF-8"

On Fri, 29 Jul 2022 at 13:13, Sami Mujawar <sami.mujawar@arm.com> wrote:
>
> Adding Leif and Mike.
>
> On 29/07/2022 08:54 pm, Sami Mujawar wrote:
> > Hi Ard,
> >
> > I have accidentally pushed a change to the edk2-platforms repo.
> >
> > The commit is
> >
> > 2faefb2bbcc8083e1bd28908c0b29b5d18595298 <Sami Mujawar> Merge branch
> > 'master' of github.com:/tianocore/edk2-platforms
> >
> > Appologies for the trouble. Can you advise on how this can be fixed,
> > please?
> >

I don't think there is anything that needs fixing here. We try to
avoid merge commits because a fully linear git history results in less
confusion when doing bisection, but there is nothing fundamentally
wrong with them.