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.web11.1765.1659126463212245238 for ; Fri, 29 Jul 2022 13:27:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cGo4tOks; 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 28411B8296A for ; Fri, 29 Jul 2022 20:27:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C822AC4347C for ; Fri, 29 Jul 2022 20:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659126460; bh=Uxqcjs8fZuNB84yOBwMTEFcNmMt+DmOIM0HUuQ6M3tk=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=cGo4tOksRybcZnzE9H6cmkeV3/baxOze6cHxwcDRka847Z7Axk8SiBLSJMRHIUpXn /V5T+AlbNcsFtGDbE2pZcNEkhCb+7NJ6nSylpiT4sI55QMrVlecdN6+F+FjDvHkFny hKO8D83w//7Ta27Iy4x4cEnyXWQqXZ1td2ozPeGzuEOCSvSDxbdhN9BuEG/S4ZoF8v IliX0CTGX87WJXOrAxqKjOBarlQdr49DnZQpp277ZPnzGyPxTfIqFjpweGfO+fY4vw KWOa9Ca22TfqvXxhwskcxTYKqtOrK4HtPhx7pRCnmRfitIng9dzbNx6kOL3JbfM/30 mm+8Kt/ybhs9A== Received: by mail-oa1-f41.google.com with SMTP id 586e51a60fabf-10dc1b16c12so7147701fac.6 for ; Fri, 29 Jul 2022 13:27:40 -0700 (PDT) X-Gm-Message-State: AJIora/o4OGS2iF+qfkQPa7zrxjfQnf4ZMO5edmbsn9fs91QTx11iJUl 8xtZm61p/z8HSCYVDR0qBAAA1XzGO5wopLt+lcA= X-Google-Smtp-Source: AGRyM1u1px89h85m1YYWSJwST1c2lXAnFk/HyuwLD/TPPtWq1029eaYl60Jv8yaFyI99WrPvCpUIM+eP5Cl6x7yoKZU= X-Received: by 2002:a05:6870:b403:b0:10e:7914:adb with SMTP id x3-20020a056870b40300b0010e79140adbmr2576383oap.126.1659126459962; Fri, 29 Jul 2022 13:27:39 -0700 (PDT) MIME-Version: 1.0 References: <8c436432-f518-469d-a3f7-425ff3051653@arm.com> <5ac96d33-d9bb-f6fa-e6c1-b17153b02fae@arm.com> In-Reply-To: From: "Ard Biesheuvel" Date: Fri, 29 Jul 2022 13:27:29 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Incorrect push to edk2-platforms To: "Kinney, Michael D" Cc: Sami Mujawar , Ard Biesheuvel , edk2-devel-groups-io , "nd@arm.com" , Leif Lindholm Content-Type: text/plain; charset="UTF-8" Reverting and reapplying kind of defeats the purpose, to be honest. The merge commit is still part of the history, and so its effect during a bisect will be there regardless. So I suggest we just leave this as is. On Fri, 29 Jul 2022 at 13:20, Kinney, Michael D wrote: > > Hi Sami, > > There is one other instance of this in edk2-platform history. > > It was immediately followed by a Revert. > > -------------- > commit 3e31cfea3de2fe49b49a67a1d6c9f9ca09e7f332 > Author: Siyuan Fu > Date: Mon Feb 10 12:29:48 2020 +0800 > > Revert "Merge remote-tracking branch 'upstream/master'" > > This reverts commit afb07dacda55f4f378fabf2e55172a95d01e5df4, reversing > changes made to 3f0d14bb1358dfadef65dbd22c8f6d3b89471d49. > > commit afb07dacda55f4f378fabf2e55172a95d01e5df4 > Merge: 0c86cf06ed 3f0d14bb13 > Author: Siyuan Fu > Date: Mon Feb 10 11:49:14 2020 +0800 > > Merge remote-tracking branch 'upstream/master' > -------------- > > Reverting the merge commit and adding the changes correctly > may be the cleanest way to address. > > Best regards, > > Mike > > > -----Original Message----- > > From: Sami Mujawar > > Sent: Friday, July 29, 2022 1:14 PM > > To: Ard Biesheuvel ; edk2-devel-groups-io ; nd@arm.com; Leif Lindholm > > ; Kinney, Michael D > > Subject: Re: Incorrect push to edk2-platforms > > > > 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 Merge branch > > > 'master' of github.com:/tianocore/edk2-platforms > > > > > > Appologies for the trouble. Can you advise on how this can be fixed, > > > please? > > > > > > Regards, > > > > > > Sami Mujawar > > > > > > > > > > > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not > > the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for > > any purpose, or store or copy the information in any medium. Thank you.