Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  net/nfc/nci/uart.c

between commit:

  d3295869c40c ("net: nfc: Fix spelling errors in net/nfc module")

from the net-next tree and commit:

  c2a5a45c0276 ("net: nfc: nci: drop nci_uart_ops::recv_buf")

from the tty tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/nfc/nci/uart.c
index 6af5752cde09,9958b37d8f9d..000000000000
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@@ -229,6 -229,72 +229,72 @@@ static void nci_uart_tty_wakeup(struct 
  	nci_uart_tx_wakeup(nu);
  }
  
+ /* -- Default recv_buf handler --
+  *
+  * This handler supposes that NCI frames are sent over UART link without any
+  * framing. It reads NCI header, retrieve the packet size and once all packet
+  * bytes are received it passes it to nci_uart driver for processing.
+  */
+ static int nci_uart_default_recv_buf(struct nci_uart *nu, const u8 *data,
+ 				     int count)
+ {
+ 	int chunk_len;
+ 
+ 	if (!nu->ndev) {
+ 		nfc_err(nu->tty->dev,
+ 			"receive data from tty but no NCI dev is attached yet, drop buffer\n");
+ 		return 0;
+ 	}
+ 
+ 	/* Decode all incoming data in packets
+ 	 * and enqueue then for processing.
+ 	 */
+ 	while (count > 0) {
+ 		/* If this is the first data of a packet, allocate a buffer */
+ 		if (!nu->rx_skb) {
+ 			nu->rx_packet_len = -1;
+ 			nu->rx_skb = nci_skb_alloc(nu->ndev,
+ 						   NCI_MAX_PACKET_SIZE,
+ 						   GFP_ATOMIC);
+ 			if (!nu->rx_skb)
+ 				return -ENOMEM;
+ 		}
+ 
+ 		/* Eat byte after byte till full packet header is received */
+ 		if (nu->rx_skb->len < NCI_CTRL_HDR_SIZE) {
+ 			skb_put_u8(nu->rx_skb, *data++);
+ 			--count;
+ 			continue;
+ 		}
+ 
+ 		/* Header was received but packet len was not read */
+ 		if (nu->rx_packet_len < 0)
+ 			nu->rx_packet_len = NCI_CTRL_HDR_SIZE +
+ 				nci_plen(nu->rx_skb->data);
+ 
+ 		/* Compute how many bytes are missing and how many bytes can
+ 		 * be consumed.
+ 		 */
+ 		chunk_len = nu->rx_packet_len - nu->rx_skb->len;
+ 		if (count < chunk_len)
+ 			chunk_len = count;
+ 		skb_put_data(nu->rx_skb, data, chunk_len);
+ 		data += chunk_len;
+ 		count -= chunk_len;
+ 
 -		/* Chcek if packet is fully received */
++		/* Check if packet is fully received */
+ 		if (nu->rx_packet_len == nu->rx_skb->len) {
+ 			/* Pass RX packet to driver */
+ 			if (nu->ops.recv(nu, nu->rx_skb) != 0)
+ 				nfc_err(nu->tty->dev, "corrupted RX packet\n");
+ 			/* Next packet will be a new one */
+ 			nu->rx_skb = NULL;
+ 		}
+ 	}
+ 
+ 	return 0;
+ }
+ 
  /* nci_uart_tty_receive()
   *
   *     Called by tty low level driver when receive data is