From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 21 Sep 2020 07:23:55 +0000 (+0200)
Subject: Merge 5.9.0-rc6 into tty-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=33f16b25a091687388152d4b29593a39d819aa22;p=linux.git

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>
---

33f16b25a091687388152d4b29593a39d819aa22
diff --cc drivers/tty/serial/8250/8250_pci.c
index 824c44ec25a8e,55bb7b897d976..d5a513efb2613
--- a/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/video/fbdev/core/fbcon.c
index 7b9df8b999e40,41f3fa3db6d4c..6fea22c4642cd
--- a/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,