Merge 5.9.0-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Sep 2020 07:23:55 +0000 (09:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Sep 2020 07:23:55 +0000 (09:23 +0200)
commit33f16b25a091687388152d4b29593a39d819aa22
tree34a8ef8acf3f14ca0e4f514756222876d00ff202
parent23f87274f0ad4a9167de23a330ed88966634fdf6
parentba4f184e126b751d1bffad5897f263108befc780
Merge 5.9.0-rc6 into tty-next

We need the tty/serial fixes in here and this resolves a merge issue in
the 8250 driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_pci.c
drivers/tty/serial/serial_core.c
drivers/video/fbdev/core/fbcon.c