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>

diff --cc drivers/tty/serial/8250/8250_pci.c
index 824c44ec25a8ef47dcfe0382e421b8072f64a095,55bb7b897d976551d9012a2f684f86e8b4d59c21..d5a513efb2613dff8ab0a309d4df1cf6222fb864
--- 1/drivers/tty/serial/8250/8250_pci.c
--- 2/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -5609,9 -5566,16 +5609,19 @@@ static const struct pci_device_id seria
                PCI_ANY_ID, PCI_ANY_ID,
                0, 0, pbn_wch384_4 },
  
 +      {       PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_8S,
 +              PCI_ANY_ID, PCI_ANY_ID,
 +              0, 0, pbn_wch384_8 },
+       /*
+        * Realtek RealManage
+        */
+       {       PCI_VENDOR_ID_REALTEK, 0x816a,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0, pbn_b0_1_115200 },
+ 
+       {       PCI_VENDOR_ID_REALTEK, 0x816b,
+               PCI_ANY_ID, PCI_ANY_ID,
+               0, 0, pbn_b0_1_115200 },
  
        /* Fintek PCI serial cards */
        { PCI_DEVICE(0x1c29, 0x1104), .driver_data = pbn_fintek_4 },

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

diff --cc drivers/video/fbdev/core/fbcon.c
index 7b9df8b999e40a4b986e03c69c45c1e37c8bea0d,41f3fa3db6d4ca8c6e156a1bf0f046f69b29ac75..6fea22c4642cda9e774152ef70b9ddc28b774de9
--- 1/drivers/video/fbdev/core/fbcon.c
--- 2/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@@ -2786,21 -2588,9 +2588,9 @@@ static void fbcon_set_palette(struct vc
        fb_set_cmap(&palette_cmap, info);
  }
  
 -static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
 +static u16 *fbcon_screen_pos(const struct vc_data *vc, int offset)
  {
-       unsigned long p;
-       int line;
-       
-       if (vc->vc_num != fg_console || !softback_lines)
-               return (u16 *) (vc->vc_origin + offset);
-       line = offset / vc->vc_size_row;
-       if (line >= softback_lines)
-               return (u16 *) (vc->vc_origin + offset -
-                               softback_lines * vc->vc_size_row);
-       p = softback_curr + offset;
-       if (p >= softback_end)
-               p += softback_buf - softback_end;
-       return (u16 *) p;
+       return (u16 *) (vc->vc_origin + offset);
  }
  
  static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos,