Merge 4.8-rc5 into tty-next

We want the fixes in here for merge issues.

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

diff --cc drivers/tty/serial/8250/8250.h
Simple merge

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

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

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

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

diff --cc drivers/tty/serial/8250/Kconfig
Simple merge