Commit d6efb3ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents c0c419c0 f6c6eb2f

Documentation/devicetree/bindings/serial/st,stm32-uart.yaml

+3 −1
Original line number Original line Diff line number Diff line
@@ -35,9 +35,11 @@ properties: 
    description: label associated with this uart

    description: label associated with this uart





  st,hw-flow-ctrl:

  st,hw-flow-ctrl:

    description: enable hardware flow control

    description: enable hardware flow control (deprecated)

    $ref: /schemas/types.yaml#/definitions/flag

    $ref: /schemas/types.yaml#/definitions/flag





  uart-has-rtscts: true



  dmas:

  dmas:

    minItems: 1

    minItems: 1

    maxItems: 2

    maxItems: 2

Documentation/driver-api/serial/n_gsm.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ GSM 0710 tty multiplexor HOWTO 
This line discipline implements the GSM 07.10 multiplexing protocol

This line discipline implements the GSM 07.10 multiplexing protocol

detailed in the following 3GPP document:

detailed in the following 3GPP document:





	http://www.3gpp.org/ftp/Specs/archive/07_series/07.10/0710-720.zip

	https://www.3gpp.org/ftp/Specs/archive/07_series/07.10/0710-720.zip





This document give some hints on how to use this driver with GPRS and 3G

This document give some hints on how to use this driver with GPRS and 3G

modems connected to a physical serial port.

modems connected to a physical serial port.

MAINTAINERS

+6 −0
Original line number Original line Diff line number Diff line
@@ -4386,6 +4386,12 @@ L: netdev@vger.kernel.org 
S:	Maintained

S:	Maintained

F:	drivers/connector/

F:	drivers/connector/




















CONSOLE SUBSYSTEM














M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>














S:	Supported














F:	drivers/video/console/














F:	include/linux/console*
























CONTROL GROUP (CGROUP)







CONTROL GROUP (CGROUP)











M:	Tejun Heo <tj@kernel.org>







M:	Tejun Heo <tj@kernel.org>











M:	Li Zefan <lizefan@huawei.com>







M:	Li Zefan <lizefan@huawei.com>

































arch/um/drivers/line.c



+0
−5






























Original line number
Original line
Diff line number
Diff line








@@ -184,11 +184,6 @@ void line_flush_chars(struct tty_struct *tty)









	line_flush_buffer(tty);







	line_flush_buffer(tty);











}







}































int line_put_char(struct tty_struct *tty, unsigned char ch)














{














	return line_write(tty, &ch, sizeof(ch));














}





























int line_write(struct tty_struct *tty, const unsigned char *buf, int len)







int line_write(struct tty_struct *tty, const unsigned char *buf, int len)











{







{











	struct line *line = tty->driver_data;







	struct line *line = tty->driver_data;

































arch/um/drivers/line.h



+0
−1






























Original line number
Original line
Diff line number
Diff line








@@ -66,7 +66,6 @@ extern int line_setup(char **conf, unsigned nlines, char **def,









		      char *init, char *name);







		      char *init, char *name);











extern int line_write(struct tty_struct *tty, const unsigned char *buf,







extern int line_write(struct tty_struct *tty, const unsigned char *buf,











		      int len);







		      int len);











extern int line_put_char(struct tty_struct *tty, unsigned char ch);














extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);







extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);











extern int line_chars_in_buffer(struct tty_struct *tty);







extern int line_chars_in_buffer(struct tty_struct *tty);











extern void line_flush_buffer(struct tty_struct *tty);







extern void line_flush_buffer(struct tty_struct *tty);









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE