From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 May 2016 03:57:27 +0000 (-0700)
Subject: Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v4.7-rc1~94
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e10abc629f38efd9b6936cf3612583cc846104d9;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'tty-4.7-rc1' of git://git./linux/kernel/git/gregkh/tty

Pull tty and serial driver updates from Greg KH:
 "Here's the large TTY and Serial driver update for 4.7-rc1.

  A few new serial drivers are added here, and Peter has fixed a bunch
  of long-standing bugs in the tty layer and serial drivers as normal.
  Full details in the shortlog.

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

* tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (88 commits)
  MAINTAINERS: 8250: remove website reference
  serial: core: Fix port mutex assert if lockdep disabled
  serial: 8250_dw: fix wrong logic in dw8250_check_lcr()
  tty: vt, finish looping on duplicate
  tty: vt, return error when con_startup fails
  QE-UART: add "fsl,t1040-ucc-uart" to of_device_id
  serial: mctrl_gpio: Drop support for out1-gpios and out2-gpios
  serial: 8250dw: Add device HID for future AMD UART controller
  Fix OpenSSH pty regression on close
  serial: mctrl_gpio: add IRQ locking
  serial: 8250: Integrate Fintek into 8250_base
  serial: mps2-uart: add support for early console
  serial: mps2-uart: add MPS2 UART driver
  dt-bindings: document the MPS2 UART bindings
  serial: sirf: Use generic uart-has-rtscts DT property
  serial: sirf: Introduce helper variable struct device_node *np
  serial: mxs-auart: Use generic uart-has-rtscts DT property
  serial: imx: Use generic uart-has-rtscts DT property
  doc: DT: Add Generic Serial Device Tree Bindings
  serial: 8250: of: Make tegra_serial_handle_break() static
  ...
---

e10abc629f38efd9b6936cf3612583cc846104d9
diff --cc drivers/tty/serial/Makefile
index 74914aa,81e9057..1278d37
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -91,7 -91,7 +91,8 @@@ obj-$(CONFIG_SERIAL_MEN_Z135)	+= men_z1
  obj-$(CONFIG_SERIAL_SPRD) += sprd_serial.o
  obj-$(CONFIG_SERIAL_STM32)	+= stm32-usart.o
  obj-$(CONFIG_SERIAL_MVEBU_UART)	+= mvebu-uart.o
 +obj-$(CONFIG_SERIAL_PIC32)	+= pic32_uart.o
+ obj-$(CONFIG_SERIAL_MPS2_UART)	+= mps2-uart.o
  
  # GPIOLIB helpers for modem control lines
  obj-$(CONFIG_SERIAL_MCTRL_GPIO)	+= serial_mctrl_gpio.o
diff --cc include/uapi/linux/serial_core.h
index 24da334,9aef04c..99dbed8
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -264,7 -264,7 +264,10 @@@
  /* MVEBU UART */
  #define PORT_MVEBU	114
  
 +/* Microchip PIC32 UART */
 +#define PORT_PIC32	115
 +
+ /* MPS2 UART */
 -#define PORT_MPS2UART	115
++#define PORT_MPS2UART	116
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */