From nobody Sun May 19 08:26:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+98751+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98751+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1674006237; cv=none; d=zohomail.com; s=zohoarc; b=Lnj0k1HdwHcl/H1K0lsX8bQbxNKeoubj1UsFjEPqx5ZFkLSS4qxUZ42VRu2K/xJAtnlJDdknIfmhxj74n5EnRPCqnEsja00j2Qsvp6GJKH/3vxrnWdiwQPPd5M19PMQLaVmg4Lo4BE/IkOXI1Yk+hZl1RgReU4ObifTWuXKkN8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674006237; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=u9CXuTkWUFB6AowEY1bGgZ+oBohrn41Mb252pB21y3o=; b=HRO8giLZ05aYF2+bl2b1qDz9pcZlzXDFuU0feO8Kn2YPpoOolRXsVTVdMKvaFggSrBBxNj8eZ07VeNq/2Giy/ztWXAnTopzIdxbnnMEx5fsft8Bgu6fJtguHs4j55asFKRQ1crLKNuvPma6SVm8jCxcrPGmWvp8eWsyjC8GDm+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98751+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1674006237094983.8236429343503; Tue, 17 Jan 2023 17:43:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id qTp0YY1788612xkNAc4TC0j7; Tue, 17 Jan 2023 17:43:56 -0800 X-Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242]) by mx.groups.io with SMTP id smtpd.web10.5260.1674006229276071752 for ; Tue, 17 Jan 2023 17:43:53 -0800 X-Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id 0A177CD1F746 for ; Wed, 18 Jan 2023 09:43:45 +0800 (CST) X-Received: from localhost (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id 062E7CD1F728 for ; Wed, 18 Jan 2023 09:43:45 +0800 (CST) X-Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id D1F80CD1F70C for ; Wed, 18 Jan 2023 09:43:44 +0800 (CST) X-Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by walk.intel-email.com (Postfix) with SMTP id D1173CD1F714 for ; Wed, 18 Jan 2023 09:43:42 +0800 (CST) X-Received: from localhost.localdomain ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 18 Jan 2023 09:43:40 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming via groups.io" To: devel@edk2.groups.io Cc: Christopher Zurcher Subject: [edk2-devel] [PATCH] MdeModulePkg ScsiDiskDxe: Remove the left git merge comments Date: Wed, 18 Jan 2023 09:43:26 +0800 Message-Id: <20230118014326.1551-1-gaoliming@byosoft.com.cn> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,gaoliming@byosoft.com.cn X-Gm-Message-State: Vl8TQmB5vycOtfnsTAGaH5wrx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1674006236; bh=u9CXuTkWUFB6AowEY1bGgZ+oBohrn41Mb252pB21y3o=; h=Cc:Date:From:Reply-To:Subject:To; b=FItpg6u+qYf8r9hmvqjAmmEoNBluZsxuzRekds8MNKz5gizHEeMQH8JdT7WXiqaVgGv RUimlmztTGkwEW7Miib9ShCGBCnq/uuUMq4xeJEQs56CKeMKukKmTSqHm+WXUfQeCHYzN CULqoGo7zhKkuIsHYzsrBRTNaQAawmBy5QI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1674006238411100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Christopher Zurcher Reviewed-by: Liming Gao --- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bu= s/Scsi/ScsiDiskDxe/ScsiDisk.c index 6555aeed7d..f424ebd041 100644 --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c @@ -3,10 +3,7 @@ =20 Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Copyright (c) 1985 - 2022, American Megatrends International LLC.
-<<<<<<< HEAD -=3D=3D=3D=3D=3D=3D=3D =20 ->>>>>>> ace365b4e0 (MdeModulePkg/scsi :Coverity scan flags multiple issues= in edk2-stable202205) SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ --=20 2.37.3.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#98751): https://edk2.groups.io/g/devel/message/98751 Mute This Topic: https://groups.io/mt/96345717/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-