Merge 4.20-rc6 into tty-next

We want the TTY changes in here as well.

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

diff --cc drivers/gnss/sirf.c
Simple merge

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

diff --cc drivers/tty/tty_io.c
Simple merge

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