Merge tag 'v7.1-rc6' into tty-next

We need the tty/serial fixes in here as well.

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

diff --cc arch/powerpc/configs/ppc6xx_defconfig
Simple merge

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

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

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

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

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

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

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

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