[PATCH 1/1] UBUNTU: SAUCE: nvme: Merge two quirk entries into one for Intel 760p/Pro 7600p

[Po-Hsu Lin]

Hello,
Can this fix be upstreamed?
It looks like the upstream code contains only NVME_QUIRK_IGNORE_DEV_SUBNQN
Thanks

On Thu, Mar 28, 2019 at 2:59 AM Kai-Heng Feng
<kai.heng.feng at canonical.com> wrote:
>
> BugLink: https://bugs.launchpad.net/bugs/1821961
>
> The fix for LP: #1811755 make the quirk table contains two different
> quirk entries for a single device. Fix that.
>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
> ---
>  drivers/nvme/host/pci.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 3805565f4429..78972f85df3c 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -2707,10 +2707,9 @@ static const struct pci_device_id nvme_id_table[] = {
>         { PCI_VDEVICE(INTEL, 0xf1a5),   /* Intel 600P/P3100 */
>                 .driver_data = NVME_QUIRK_NO_DEEPEST_PS |
>                                 NVME_QUIRK_MEDIUM_PRIO_SQ },
> -       { PCI_VDEVICE(INTEL, 0xf1a6),
> -               .driver_data = NVME_QUIRK_NO_DISABLE, },
>         { PCI_VDEVICE(INTEL, 0xf1a6),   /* Intel 760p/Pro 7600p */
> -               .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
> +               .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN |
> +                               NVME_QUIRK_NO_DISABLE, },
>         { PCI_VDEVICE(INTEL, 0x5845),   /* Qemu emulated controller */
>                 .driver_data = NVME_QUIRK_IDENTIFY_CNS, },
>         { PCI_DEVICE(0x1c58, 0x0003),   /* HGST adapter */
> --
> 2.17.1
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team