From nobody Sun May 19 15:29:26 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+99387+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+99387+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1675233088; cv=none; d=zohomail.com; s=zohoarc; b=BSq+C2ewXIM0rvyxDv1i1PPUmFSSA46lEvf89MDh1CSw4kqBUgJcMFUV1Ojv/8BXNTqkuomuUZlnoa1m6hHv7+bBVFWm4qeIX872O4yrXMS7l7uQNJnDYVpMDCQlXO5iXRNXtUdkzxtplHH40HsJqNTxwp8g+zXGcohXorNw6Xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675233088; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Gj8861dhmJC7byXQrIUr6zecaY1dnGNCH7frIuyOLtI=; b=axLh2sWXRSnRZomofweFOYxVKPrf30SIN24V+hLojT7yh0gKNSDYJjHbsNvPc0+civ12FHZutkZtTwUSi0useInyp922oDCCy1z6TQyEa2o9OLjIX4/Kj7FYtD0snzzkB4tktMwunY+nxj1/FVBuIz3+lufGXaY6c32NehdekAw= 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+99387+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 167523308835651.95408590111799; Tue, 31 Jan 2023 22:31:28 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id FgdgYY1788612xN3ZSwqrd6N; Tue, 31 Jan 2023 22:31:28 -0800 X-Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by mx.groups.io with SMTP id smtpd.web11.17563.1675233082238984151 for ; Tue, 31 Jan 2023 22:31:22 -0800 X-Received: by mail-yb1-f201.google.com with SMTP id k204-20020a256fd5000000b007b8b040bc50so18636104ybc.1 for ; Tue, 31 Jan 2023 22:31:22 -0800 (PST) X-Gm-Message-State: UxvSfdRg3k0IYjzpSwNrl28jx1787277AA= X-Google-Smtp-Source: AK7set9U/ipAajFW5DxAehiZQFanjTxv4oILJOsI0kHB7khl+4XDy1Yeei9NBesCyv/72spIKoD+XuI5whI= X-Received: from yuanyu.kir.corp.google.com ([2620:15c:29:204:e817:cc3d:d935:8520]) (user=yuanyu job=sendgmr) by 2002:a05:690c:10:b0:506:c617:9e38 with SMTP id bc16-20020a05690c001000b00506c6179e38mr145821ywb.54.1675233081480; Tue, 31 Jan 2023 22:31:21 -0800 (PST) Date: Tue, 31 Jan 2023 22:31:17 -0800 In-Reply-To: <20230201063117.780190-1-yuanyu@google.com> Mime-Version: 1.0 References: <20230201063117.780190-1-yuanyu@google.com> Message-ID: <20230201063117.780190-2-yuanyu@google.com> Subject: [edk2-devel] [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up comment in ScsiDisk.c From: "Yuan Yu via groups.io" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Liming Gao , Hao A Wu , Ray Ni , Sivaparvathi chellaiah 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,yuanyu@google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675233088; bh=N7+TrgClz4H0kwehPCag3sK34W7Ta+Nwb+hkSQCtIHw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=bhTINjALO7uoRcNMrNSI3RDagSKc9V3VEtWVWs1sCnNlUCqam5k47de2kN3KkO7Vw3u z3cY5cNgrK3FGs9XxqLd0d3jd5kuPNKo9LHEhUcaS+qs+vxeVVNgBRsdmVDMV9pBD5Bjx KZpF8LAS3S8PY9ZE3b8qJUKMcQfbFyLFJKE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675233088699100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Comment of MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c was polluted by some previous merge. This patch clean it up. Cc: Ard Biesheuvel Cc: Liming Gao Cc: Hao A Wu Cc: Ray Ni Cc: Sivaparvathi chellaiah Signed-off-by: Yuan Yu Reviewed-by: Hao A Wu --- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bu= s/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 @@ =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 - ->>>>>>> ace365b4e0 (MdeModulePkg/scsi :Coverity scan flags multiple issues= in edk2-stable202205) SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ --=20 2.39.1.456.gfc5497dd1b-goog -=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 (#99387): https://edk2.groups.io/g/devel/message/99387 Mute This Topic: https://groups.io/mt/96671064/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-