Merge 4.0-rc3 into tty-testing

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/tty/serial/8250/8250_core.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_dw.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_pci.c
index 892eb32cdef4bd98586d02e2e432c38aea512797,c03199e122ed2796488f82a113d84548cea007bd..11784e9ad9c2d3adf5d69442f28123c7185f42cc
--- 1/drivers/tty/serial/8250/8250_pci.c
--- 2/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -1987,6 -2130,34 +2130,27 @@@ static struct pci_serial_quirk pci_seri
                .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,
 -      },
+       {
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_PNW_UART1,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .setup          = pnw_serial_setup,
+       },
+       {
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_PNW_UART2,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .setup          = pnw_serial_setup,
+       },
+       {
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_PNW_UART3,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .setup          = pnw_serial_setup,
+       },
        {
                .vendor         = PCI_VENDOR_ID_INTEL,
                .device         = PCI_DEVICE_ID_INTEL_BSW_UART1,

diff --cc drivers/tty/serial/atmel_serial.c
index 4e959c43f6804d12f8677d916e1f050bdc740457,b45a4809031e6d645d975d371fed314f5c1601b2..d58fe4763d9e1bdacf07577e3043414e22f8ecbc
--- 1/drivers/tty/serial/atmel_serial.c
--- 2/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@@ -2632,12 -2597,11 +2636,13 @@@ static int atmel_serial_probe(struct pl
        port->backup_imr = 0;
        port->uart.line = ret;
  
 +      spin_lock_init(&port->lock_suspended);
 +
        ret = atmel_init_gpios(port, &pdev->dev);
-       if (ret < 0)
-               dev_err(&pdev->dev, "%s",
-                       "Failed to initialize GPIOs. The serial port may not work as expected");
+       if (ret < 0) {
+               dev_err(&pdev->dev, "Failed to initialize GPIOs.");
+               goto err;
+       }
  
        ret = atmel_init_port(port, pdev);
        if (ret)

diff --cc drivers/tty/serial/sprd_serial.c
Simple merge

diff --cc include/linux/serial_core.h
Simple merge

diff --cc kernel/printk/printk.c
Simple merge