Merged via: PR - https://github.com/tianocore/edk2/pull/3992 Commit - https://github.com/tianocore/edk2/commit/7623b4bf6a4541b1bc5ad1978f27a55f2fb62c5f
Best Regards, Hao Wu > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Hao > A > Sent: Wednesday, February 1, 2023 2:49 PM > To: Yuan Yu <yua...@google.com>; devel@edk2.groups.io > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Gao, Liming > <gaolim...@byosoft.com.cn>; Ni, Ray <ray...@intel.com>; C, sivaparvathi > <sivaparvat...@ami.com> > Subject: Re: [edk2-devel] [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean > up comment in ScsiDisk.c > > Reviewed-by: Hao A Wu <hao.a...@intel.com> > > Best Regards, > Hao Wu > > > -----Original Message----- > > From: Yuan Yu <yua...@google.com> > > Sent: Wednesday, February 1, 2023 2:31 PM > > To: devel@edk2.groups.io > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Gao, Liming > > <gaolim...@byosoft.com.cn>; Wu, Hao A <hao.a...@intel.com>; Ni, Ray > > <ray...@intel.com>; C, sivaparvathi <sivaparvat...@ami.com> > > Subject: [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up comment in > > ScsiDisk.c > > > > Comment of MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c was polluted > > by some previous merge. This patch clean it up. > > > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > > Cc: Liming Gao <gaolim...@byosoft.com.cn> > > Cc: Hao A Wu <hao.a...@intel.com> > > Cc: Ray Ni <ray...@intel.com> > > Cc: Sivaparvathi chellaiah <sivaparvat...@ami.com> > > > > Signed-off-by: Yuan Yu <yua...@google.com> > > --- > > MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > index 6555aeed7d69..fbc236cb465e 100644 > > --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c > > @@ -3,10 +3,6 @@ > > > > Copyright (c) 2006 - 2019, Intel Corporation. All rights > > reserved.<BR> Copyright (c) 1985 - 2022, American Megatrends > > International LLC.<BR> -<<<<<<< HEAD -======= > > - > > ->>>>>>> ace365b4e0 (MdeModulePkg/scsi :Coverity scan flags multiple > > issues in edk2-stable202205) > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > **/ > > -- > > 2.39.1.456.gfc5497dd1b-goog > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#99650): https://edk2.groups.io/g/devel/message/99650 Mute This Topic: https://groups.io/mt/96671064/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
