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

Pull tty / serial updates from Greg KH:
 "Here is the big set of tty and serial driver patches for 5.14-rc1.

  A bit more than normal, but nothing major, lots of cleanups.
  Highlights are:

   - lots of tty api cleanups and mxser driver cleanups from Jiri

   - build warning fixes

   - various serial driver updates

   - coding style cleanups

   - various tty driver minor fixes and updates

   - removal of broken and disable r3964 line discipline (finally!)

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

* tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (227 commits)
  serial: mvebu-uart: remove unused member nb from struct mvebu_uart
  arm64: dts: marvell: armada-37xx: Fix reg for standard variant of UART
  dt-bindings: mvebu-uart: fix documentation
  serial: mvebu-uart: correctly calculate minimal possible baudrate
  serial: mvebu-uart: do not allow changing baudrate when uartclk is not available
  serial: mvebu-uart: fix calculation of clock divisor
  tty: make linux/tty_flip.h self-contained
  serial: Prefer unsigned int to bare use of unsigned
  serial: 8250: 8250_omap: Fix possible interrupt storm on K3 SoCs
  serial: qcom_geni_serial: use DT aliases according to DT bindings
  Revert "tty: serial: Add UART driver for Cortina-Access platform"
  tty: serial: Add UART driver for Cortina-Access platform
  MAINTAINERS: add me back as mxser maintainer
  mxser: Documentation, fix typos
  mxser: Documentation, make the docs up-to-date
  mxser: Documentation, remove traces of callout device
  mxser: introduce mxser_16550A_or_MUST helper
  mxser: rename flags to old_speed in mxser_set_serial_info
  mxser: use port variable in mxser_set_serial_info
  mxser: access info->MCR under info->slock
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/devicetree/bindings/serial/samsung_uart.yaml
Simple merge

diff --cc MAINTAINERS
index f2bfabc,25d7d86..3298f45
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12520,14 -12388,9 +12520,15 @@@ F: Documentation/userspace-api/media/dr
  F:    drivers/media/pci/meye/
  F:    include/uapi/linux/meye.h
  
 +MOTORCOMM PHY DRIVER
 +M:    Peter Geis <pgwipeout@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/phy/motorcomm.c
 +
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
- S:    Orphan
+ M:    Jiri Slaby <jirislaby@kernel.org>
+ S:    Maintained
  F:    Documentation/driver-api/serial/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/ipack/devices/ipoctal.c
Simple merge

diff --cc drivers/net/caif/caif_serial.c
Simple merge

diff --cc drivers/net/hamradio/6pack.c
Simple merge

diff --cc drivers/net/hamradio/mkiss.c
Simple merge

diff --cc drivers/net/usb/hso.c
Simple merge

diff --cc drivers/s390/char/con3215.c
Simple merge

diff --cc drivers/s390/char/sclp_rw.c
Simple merge

diff --cc drivers/s390/char/sclp_rw.h
index a912748,b4506be..9b779ee
--- 1/drivers/s390/char/sclp_rw.h
--- 2/drivers/s390/char/sclp_rw.h
+++ b/drivers/s390/char/sclp_rw.h
@@@ -86,6 -86,12 +86,6 @@@ void *sclp_unmake_buffer(struct sclp_bu
  int sclp_buffer_space(struct sclp_buffer *);
  int sclp_write(struct sclp_buffer *buffer, const unsigned char *, int);
  int sclp_emit_buffer(struct sclp_buffer *,void (*)(struct sclp_buffer *,int));
- int sclp_chars_in_buffer(struct sclp_buffer *);
+ unsigned int sclp_chars_in_buffer(struct sclp_buffer *);
  
 -#ifdef CONFIG_SCLP_CONSOLE
 -void sclp_console_pm_event(enum sclp_pm_event sclp_pm_event);
 -#else
 -static inline void sclp_console_pm_event(enum sclp_pm_event sclp_pm_event) { }
 -#endif
 -
  #endif        /* __SCLP_RW_H__ */

diff --cc drivers/s390/char/sclp_tty.c
index f5591bf,162127f..6be9de8
--- 1/drivers/s390/char/sclp_tty.c
--- 2/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@@ -284,14 -284,15 +284,13 @@@ static unsigned in
  sclp_tty_chars_in_buffer(struct tty_struct *tty)
  {
        unsigned long flags;
 -      struct list_head *l;
        struct sclp_buffer *t;
-       int count;
+       unsigned int count = 0;
  
        spin_lock_irqsave(&sclp_tty_lock, flags);
-       count = 0;
        if (sclp_ttybuf != NULL)
                count = sclp_chars_in_buffer(sclp_ttybuf);
 -      list_for_each(l, &sclp_tty_outqueue) {
 -              t = list_entry(l, struct sclp_buffer, list);
 +      list_for_each_entry(t, &sclp_tty_outqueue, list) {
                count += sclp_chars_in_buffer(t);
        }
        spin_unlock_irqrestore(&sclp_tty_lock, flags);

diff --cc drivers/s390/char/sclp_vt220.c
Simple merge

diff --cc drivers/staging/fwserial/fwserial.c
Simple merge

diff --cc drivers/tty/hvc/hvc_iucv.c
Simple merge

diff --cc drivers/tty/vcc.c
Simple merge

diff --cc net/bluetooth/rfcomm/tty.c
Simple merge