diff mbox series

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

Message ID 20210406184814.3c958f51@canb.auug.org.au (mailing list archive)
State Not Applicable
Delegated to: Netdev Maintainers
Headers show
Series linux-next: manual merge of the tty tree with the net-next tree | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Stephen Rothwell April 6, 2021, 8:48 a.m. UTC
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.

Comments

Greg KH April 6, 2021, 9:11 a.m. UTC | #1
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:
> 
>   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.

Change looks correct to me, thanks!

greg k-h
diff mbox series

Patch

diff --cc net/nfc/nci/uart.c
index 6af5752cde09,9958b37d8f9d..000000000000
--- a/net/nfc/nci/uart.c