Re: linux-next: manual merge of the tty tree with the net-next tree

On Tue, Apr 06, 2021 at 06:48:14PM +1000, Stephen Rothwell wrote: > 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:

linux-next: manual merge of the tty tree with the net-next tree

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 f