Merge 5.7-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 May 2020 06:55:10 +0000 (08:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 May 2020 06:55:10 +0000 (08:55 +0200)
commit1cc18584e5acfd845464616b66fb2fd81eff467e
tree4b16a54c9dd234c5fe9efb9b346249003b588e09
parent57253ccd5831e7e5720c433437775c3e6b7d0c72
parent2ef96a5bb12be62ef75b5828c0aab838ebb29cb8
Merge 5.7-rc5 into tty-next

We need the tty fixes in here too.

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