From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Aug 2020 21:56:11 +0000 (-0700)
Subject: Merge tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6efb3ac3e6c19ab722b28bdb9252bae0b9676b6;p=people%2Fms%2Flinux.git

Merge tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial updates from Greg KH:
 "Here is the large set of TTY and Serial driver patches for 5.9-rc1.

  Lots of bugfixes in here, thanks to syzbot fuzzing for serial and vt
  and console code.

  Other highlights include:

   - much needed vt/vc code cleanup from Jiri Slaby

   - 8250 driver fixes and additions

   - various serial driver updates and feature enhancements

   - locking cleanup for serial/console initializations

   - other minor cleanups

  All of these have been in linux-next with no reported issues"

* tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (90 commits)
  MAINTAINERS: enlist Greg formally for console stuff
  vgacon: Fix for missing check in scrollback handling
  Revert "serial: 8250: Let serial core initialise spin lock"
  serial: 8250: Let serial core initialise spin lock
  tty: keyboard, do not speculate on func_table index
  serial: stm32: Add RS485 RTS GPIO control
  serial: 8250_dw: Fix common clocks usage race condition
  serial: 8250_dw: Pass the same rate to the clk round and set rate methods
  serial: 8250_dw: Simplify the ref clock rate setting procedure
  serial: 8250: Add 8250 port clock update method
  tty: serial: imx: add imx earlycon driver
  tty: serial: imx: enable imx serial console port as module
  tty/synclink: remove leftover bits of non-PCI card support
  tty: Use the preferred form for passing the size of a structure type
  tty: Fix identation issues in struct serial_struct32
  tty: Avoid the use of one-element arrays
  serial: msm_serial: add sparse context annotation
  serial: pmac_zilog: add sparse context annotation
  newport_con: vc_color is now in state
  serial: imx: use hrtimers for rs485 delays
  ...
---

d6efb3ac3e6c19ab722b28bdb9252bae0b9676b6
diff --cc drivers/tty/serial/qcom_geni_serial.c
index 07b7b6b05b8b,1ed3d354e16d..3aa29d201f54
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@@ -768,8 -718,8 +768,8 @@@ static void qcom_geni_serial_handle_tx(
  		u8 buf[sizeof(u32)];
  		int c;
  
- 		memset(buf, 0, ARRAY_SIZE(buf));
+ 		memset(buf, 0, sizeof(buf));
 -		tx_bytes = min_t(size_t, remaining, port->tx_bytes_pw);
 +		tx_bytes = min_t(size_t, remaining, BYTES_PER_FIFO_WORD);
  
  		for (c = 0; c < tx_bytes ; c++) {
  			buf[c] = xmit->buf[tail++];
diff --cc drivers/video/fbdev/core/fbcon.c
index af9f5ab96f74,2997b2907172..8a31fc2b2258
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@@ -676,8 -676,8 +676,8 @@@ static void fbcon_prepare_logo(struct v
  		q = (unsigned short *) (vc->vc_origin +
  					vc->vc_size_row *
  					rows);
 -		scr_memcpyw(q, save, logo_lines * new_cols * 2);
 +		scr_memcpyw(q, save, array3_size(logo_lines, new_cols, 2));
- 		vc->vc_y += logo_lines;
+ 		vc->state.y += logo_lines;
  		vc->vc_pos += logo_lines * vc->vc_size_row;
  		kfree(save);
  	}