From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20210112 header.b=WnrjYYoU; spf=pass (domain: flex--yuanyu.bounces.google.com, ip: 209.85.219.201, mailfrom: 3oqfaywykbdqok0dok6ee6b4.2ec34l4b43as.6hekfi.8e@flex--yuanyu.bounces.google.com) Received: by mail-yb1-f201.google.com with SMTP id k204-20020a256fd5000000b007b8b040bc50so18636104ybc.1 for ; Tue, 31 Jan 2023 22:31:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=7LGTKvqt++2+4OEXdXn4yz5OQe0qK2yZAElPZ6Nr+pg=; b=WnrjYYoUBZvd22Ccu+XJEjK0WpLj5zxJ8wnnZIK+nVP1L2j9BUOLj/Xv4XOsT7J8Jn j+oUBQCVggEJaqh8wFx2NzbPYPd5cDU0ZwwOwea62P/YkFfHnvCI61tBdN39yLEiVtLJ N5hmUpotDuyVQlxVKxHf9knq9GBu9chiVsqRUJ5G8dhI99Wcdp35CPSR1F9BGXL6OLsL JZ+P3blCy6uDYbHKgZ6IrqnWrMC4YLHu7DEciYcSgJz+3Zgg753rWTk8/fO1t+Dbp3Zt TryNs1pF3e8Eku6EHsxFtFR0mOgKwf2lr6gxEYpV9nPDgbVTYb5SmjxKvcOvrELazz3M g4fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7LGTKvqt++2+4OEXdXn4yz5OQe0qK2yZAElPZ6Nr+pg=; b=o8+OcGTHxH4kpeH2UQyWw2HZrUblUJViukawVBexo69Soe9Aa9jaswVWvSCcDabwn5 QTLf+ohed/Z/MNPSZL3mseBenBiCc1ICkvwXHVPEsK2kuQve3fcQd/6TxKXekIHVOwKD 55/M+rpxqbRWOFjYnJcEkcIIyqit/JbaEK/N0fOdE4YtKWVUfzND/tQMiNGMicKL+mC+ q1EcVFG7fZRNlFxoFZ1VlSy/T7HrjU5fQFsVPkqiLer18cal01CYlhjmi7fnwO4ma0Ms +zuYIVKmoQk5gk/bZgOpUO+JfKBs2PyolFoLBJUBoNFnFmNEzEu+5cnjwPEh5/4G3u1q OMug== X-Gm-Message-State: AO0yUKWeOhb/3UWHZul7leiCO/BIVqEN9YiySD9V0JmGuIRwUqI1OJQV Z/ubwkEPIiyg2r1fjToFjLdsN67kNrvSW8z74QyciK4iI/xD4oHziyRp1to60HJk0VyRaWf4oky hB0xr7/CZhmp17WYGngvtU40QMp/sjrrypeMT39mRUgN8/Cbc+CmS/mNoKME= 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> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230201063117.780190-2-yuanyu@google.com> Subject: [PATCH v1 1/1] MdeModulePkg: ScsiDiskDxe: clean up comment in ScsiDisk.c From: "Yuan Yu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Liming Gao , Hao A Wu , Ray Ni , Sivaparvathi chellaiah 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 --- 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.
Copyright (c) 1985 - 2022, American Megatrends International LLC.
-<<<<<<< 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