linux-next: manual merge of the tty tree with the slave-dma tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250/8250_pci.c between commit 29897087d901 ("Add
new PCI IDs to cover newer Intel SoCs such as Braswell") from the
slave-dma tree and commit 1ede7dcca3c4 ("serial: 8250: Add Quark X1000
to 8250_pci.c") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/tty/serial/8250/8250_pci.c
index 85a2eb986ffe,4f1cd296f1b1..000000000000
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -1934,18 -1888,11 +1922,25 @@@ static struct pci_serial_quirk pci_seri
        },
        {
                .vendor         = PCI_VENDOR_ID_INTEL,
 +              .device         = PCI_DEVICE_ID_INTEL_BSW_UART1,
 +              .subvendor      = PCI_ANY_ID,
 +              .subdevice      = PCI_ANY_ID,
 +              .setup          = byt_serial_setup,
 +      },
 +      {
 +              .vendor         = PCI_VENDOR_ID_INTEL,
 +              .device         = PCI_DEVICE_ID_INTEL_BSW_UART2,
 +              .subvendor      = PCI_ANY_ID,
 +              .subdevice      = PCI_ANY_ID,
 +              .setup          = byt_serial_setup,
 +      },
++      {
++              .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_QRK_UART,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .setup          = pci_default_setup,
+       },
        /*
         * ITE
         */

signature.asc
Description: PGP signature