Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
  TTY: serial_core: Fix crash if DCD drop during suspend
  tty/serial: atmel_serial: bootconsole removed from auto-enumerates
  Revert "TTY: call tty_driver_lookup_tty unconditionally"
  tty/serial: atmel_serial: add device tree support
  tty/serial: atmel_serial: auto-enumerate ports
  tty/serial: atmel_serial: whitespace and braces modifications
  tty/serial: atmel_serial: change platform_data variable name
  tty/serial: RS485 bindings for device tree
  TTY: call tty_driver_lookup_tty unconditionally
  TTY: pty, release tty in all ptmx_open fail paths
  TTY: make tty_add_file non-failing
  TTY: drop driver reference in tty_open fail path
  8250_pci: Fix kernel panic when pch_uart is disabled
  h8300: drivers/serial/Kconfig was moved
  parport_pc: release IO region properly if unsupported ITE887x card is found
  tty: Support compat_ioctl get/set termios_locked
  hvc_console: display printk messages on console.
  TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
  tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
  tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
  ...

Fix up Conflicts in:
 - drivers/tty/serial/8250_pci.c
	Trivial conflict with removed duplicate device ID
 - drivers/tty/serial/atmel_serial.c
	Annoying silly conflict between "specify the port num via
	platform_data" and other changes to atmel_console_init

1 files changed, 34 insertions, 0 deletions

diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 33175504bb39..8816f53e004d 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -354,3 +354,37 @@ config TRACE_SINK
 
           If you select this option, you need to select
           "Trace data router for MIPI P1149.7 cJTAG standard".
+
+config PPC_EPAPR_HV_BYTECHAN
+        tristate "ePAPR hypervisor byte channel driver"
+        depends on PPC
+        help
+          This driver creates /dev entries for each ePAPR hypervisor byte
+          channel, thereby allowing applications to communicate with byte
+          channels as if they were serial ports.
+
+config PPC_EARLY_DEBUG_EHV_BC
+        bool "Early console (udbg) support for ePAPR hypervisors"
+        depends on PPC_EPAPR_HV_BYTECHAN
+        help
+          Select this option to enable early console (a.k.a. "udbg") support
+          via an ePAPR byte channel.  You also need to choose the byte channel
+          handle below.
+
+config PPC_EARLY_DEBUG_EHV_BC_HANDLE
+        int "Byte channel handle for early console (udbg)"
+        depends on PPC_EARLY_DEBUG_EHV_BC
+        default 0
+        help
+          If you want early console (udbg) output through a byte channel,
+          specify the handle of the byte channel to use.
+
+          For this to work, the byte channel driver must be compiled
+          in-kernel, not as a module.
+
+          Note that only one early console driver can be enabled, so don't
+          enable any others if you enable this one.
+
+          If the number you specify is not a valid byte channel handle, then
+          there simply will be no early console output.  This is true also
+          if you don't boot under a hypervisor at all.