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
Simple merge

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

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