From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2011 19:23:20 +0000 (-0700)
Subject: Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
X-Git-Tag: v3.0-rc1~338
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99dff5856220a02b8711f2e8746413ea6e53ccf6;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'tty-next' of git://git./linux/kernel/git/gregkh/tty-2.6

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
  serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
  tty/serial: Fix break handling for PORT_TEGRA
  tty/serial: Add explicit PORT_TEGRA type
  n_tracerouter and n_tracesink ldisc additions.
  Intel PTI implementaiton of MIPI 1149.7.
  Kernel documentation for the PTI feature.
  export kernel call get_task_comm().
  tty: Remove to support serial for S5P6442
  pch_phub: Support new device ML7223
  8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
  ASoC: Update cx20442 for TTY API change
  pch_uart: Support new device ML7223 IOH
  parport: Use request_muxed_region for IT87 probe and lock
  tty/serial: add support for Xilinx PS UART
  n_gsm: Use print_hex_dump_bytes
  drivers/tty/moxa.c: Put correct tty value
  TTY: tty_io, annotate locking functions
  TTY: serial_core, remove superfluous set_task_state
  TTY: serial_core, remove invalid test
  Char: moxa, fix locking in moxa_write
  ...

Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.

I did the hci_ldisc thing as an evil merge, cleaning things up.
---

99dff5856220a02b8711f2e8746413ea6e53ccf6
diff --cc drivers/bluetooth/hci_ldisc.c
index 320f718,0d4da5e..b3f0199
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@@ -355,23 -355,23 +355,24 @@@ static void hci_uart_tty_wakeup(struct 
   *             flags        pointer to flags for data
   *             count        count of received data in bytes
   *     
-- * Return Value:    None
++ * Return Value:    Number of bytes received
   */
- static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *flags, int count)
+ static unsigned int hci_uart_tty_receive(struct tty_struct *tty,
+ 		const u8 *data, char *flags, int count)
  {
- 	int ret;
  	struct hci_uart *hu = (void *)tty->disc_data;
+ 	int received;
  
  	if (!hu || tty != hu->tty)
- 		return;
+ 		return -ENODEV;
  
  	if (!test_bit(HCI_UART_PROTO_SET, &hu->flags))
- 		return;
+ 		return -EINVAL;
  
  	spin_lock(&hu->rx_lock);
- 	ret = hu->proto->recv(hu, (void *) data, count);
- 	if (ret > 0)
- 		hu->hdev->stat.byte_rx += count;
+ 	received = hu->proto->recv(hu, (void *) data, count);
 -	hu->hdev->stat.byte_rx += count;
++	if (received > 0)
++		hu->hdev->stat.byte_rx += received;
  	spin_unlock(&hu->rx_lock);
  
  	tty_unthrottle(tty);
diff --cc drivers/tty/serial/Makefile
index 3527604,aafddf1..cb2628f
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -94,4 -94,4 +94,5 @@@ obj-$(CONFIG_SERIAL_IFX6X60)  	+= ifx6x
  obj-$(CONFIG_SERIAL_PCH_UART)	+= pch_uart.o
  obj-$(CONFIG_SERIAL_MSM_SMD)	+= msm_smd_tty.o
  obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
 +obj-$(CONFIG_SERIAL_LANTIQ)	+= lantiq.o
+ obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o