* [PATCH v1 0/1] Fix comment in ScsiDisk.c @ 2023-02-01 6:31 Yuan Yu 2023-02-01 6:31 ` [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up " Yuan Yu 0 siblings, 1 reply; 4+ messages in thread From: Yuan Yu @ 2023-02-01 6:31 UTC (permalink / raw) To: devel; +Cc: Ard Biesheuvel, Liming Gao, Hao A Wu, Ray Ni, Sivaparvathi chellaiah This patch cleans up comment of ScsiDisk.c. The change can be seen at: https://github.com/yyu/edk2/tree/comment_fix_v1 Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Hao A Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Sivaparvathi chellaiah <sivaparvathic@ami.com> Yuan Yu (1): MdeModulePkg: ScsiDiskDxe: clean up comment in ScsiDisk.c MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.39.1.456.gfc5497dd1b-goog ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up comment in ScsiDisk.c 2023-02-01 6:31 [PATCH v1 0/1] Fix comment in ScsiDisk.c Yuan Yu @ 2023-02-01 6:31 ` Yuan Yu 2023-02-01 6:49 ` Wu, Hao A 0 siblings, 1 reply; 4+ messages in thread From: Yuan Yu @ 2023-02-01 6:31 UTC (permalink / raw) To: devel; +Cc: Ard Biesheuvel, Liming Gao, Hao A Wu, Ray Ni, Sivaparvathi chellaiah Comment of MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c was polluted by some previous merge. This patch clean it up. Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Hao A Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Sivaparvathi chellaiah <sivaparvathic@ami.com> Signed-off-by: Yuan Yu <yuanyu@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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up comment in ScsiDisk.c 2023-02-01 6:31 ` [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up " Yuan Yu @ 2023-02-01 6:49 ` Wu, Hao A 2023-02-06 1:05 ` [edk2-devel] " Wu, Hao A 0 siblings, 1 reply; 4+ messages in thread From: Wu, Hao A @ 2023-02-01 6:49 UTC (permalink / raw) To: Yuan Yu, devel@edk2.groups.io Cc: Ard Biesheuvel, Gao, Liming, Ni, Ray, C, sivaparvathi Reviewed-by: Hao A Wu <hao.a.wu@intel.com> Best Regards, Hao Wu > -----Original Message----- > From: Yuan Yu <yuanyu@google.com> > Sent: Wednesday, February 1, 2023 2:31 PM > To: devel@edk2.groups.io > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Gao, Liming > <gaoliming@byosoft.com.cn>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray > <ray.ni@intel.com>; C, sivaparvathi <sivaparvathic@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+tianocore@kernel.org> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > Cc: Hao A Wu <hao.a.wu@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Sivaparvathi chellaiah <sivaparvathic@ami.com> > > Signed-off-by: Yuan Yu <yuanyu@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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up comment in ScsiDisk.c 2023-02-01 6:49 ` Wu, Hao A @ 2023-02-06 1:05 ` Wu, Hao A 0 siblings, 0 replies; 4+ messages in thread From: Wu, Hao A @ 2023-02-06 1:05 UTC (permalink / raw) To: devel@edk2.groups.io, Wu, Hao A, Yuan Yu Cc: Ard Biesheuvel, Gao, Liming, Ni, Ray, C, sivaparvathi 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 <yuanyu@google.com>; devel@edk2.groups.io > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Gao, Liming > <gaoliming@byosoft.com.cn>; Ni, Ray <ray.ni@intel.com>; C, sivaparvathi > <sivaparvathic@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.wu@intel.com> > > Best Regards, > Hao Wu > > > -----Original Message----- > > From: Yuan Yu <yuanyu@google.com> > > Sent: Wednesday, February 1, 2023 2:31 PM > > To: devel@edk2.groups.io > > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Gao, Liming > > <gaoliming@byosoft.com.cn>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray > > <ray.ni@intel.com>; C, sivaparvathi <sivaparvathic@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+tianocore@kernel.org> > > Cc: Liming Gao <gaoliming@byosoft.com.cn> > > Cc: Hao A Wu <hao.a.wu@intel.com> > > Cc: Ray Ni <ray.ni@intel.com> > > Cc: Sivaparvathi chellaiah <sivaparvathic@ami.com> > > > > Signed-off-by: Yuan Yu <yuanyu@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 > > > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-06 1:05 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-02-01 6:31 [PATCH v1 0/1] Fix comment in ScsiDisk.c Yuan Yu 2023-02-01 6:31 ` [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up " Yuan Yu 2023-02-01 6:49 ` Wu, Hao A 2023-02-06 1:05 ` [edk2-devel] " Wu, Hao A
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox