Merge 5.7-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Apr 2020 07:33:21 +0000 (09:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Apr 2020 07:33:21 +0000 (09:33 +0200)
commite947861d0ccbc765af4512a395251e6af6857600
treee2b8d646f40016e887162bcaf53859edaae15bc9
parent6f1c0268a4871a80c0ec78142eeb1fe0556e898a
parent6a8b55ed4056ea5559ebe4f6a4b247f627870d4c
Merge 5.7-rc3 into tty-next

We need the tty/serial fixes in here too.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/rocket.c
drivers/tty/serial/xilinx_uartps.c