Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Linus Torvalds [Wed, 26 Oct 2011 13:11:09 +0000 (15:11 +0200)]
* '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

20 files changed:
1  2 
arch/arm/Kconfig
arch/h8300/Kconfig
arch/x86/platform/mrst/mrst.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/tty/Kconfig
drivers/tty/pty.c
drivers/tty/serial/8250.c
drivers/tty/serial/8250_pci.c
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/lantiq.c
drivers/tty/serial/max3107.c
drivers/tty/serial/mrst_max3110.c
drivers/tty/serial/pch_uart.c
drivers/tty/serial/samsung.c
drivers/tty/serial/serial_core.c
drivers/tty/serial/sh-sci.c
drivers/tty/serial/ucc_uart.c
drivers/tty/tty_io.c
include/linux/tty.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1598,7 -1639,14 +1639,8 @@@ static struct pci_serial_quirk pci_seri
                .vendor         = 0x10DB,
                .device         = 0x800D,
                .init           = pci_eg20t_init,
+               .setup          = pci_default_setup,
        },
 -      {
 -              .vendor         = 0x10DB,
 -              .device         = 0x800D,
 -              .init           = pci_eg20t_init,
 -              .setup          = pci_default_setup,
 -      },
        /*
         * Cronyx Omega PCI (PLX-chip based)
         */
@@@ -1609,12 -1671,14 +1671,16 @@@ static struct console atmel_console = 
  static int __init atmel_console_init(void)
  {
        if (atmel_default_console_device) {
 -              int id = atmel_default_console_device->id;
 +              struct atmel_uart_data *pdata =
 +                      atmel_default_console_device->dev.platform_data;
++              int id = pdata->num;
+               struct atmel_uart_port *port = &atmel_ports[id];
+               port->backup_imr = 0;
+               port->uart.line = id;
  
-               add_preferred_console(ATMEL_DEVICENAME, pdata->num, NULL);
-               atmel_init_port(&atmel_ports[pdata->num],
-                               atmel_default_console_device);
+               add_preferred_console(ATMEL_DEVICENAME, id, NULL);
+               atmel_init_port(port, atmel_default_console_device);
                register_console(&atmel_console);
        }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge