From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Jiri Slaby <jirislaby@kernel.org>, Jiri Slaby <jslaby@suse.cz>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Zheng Yongjun <zhengyongjun3@huawei.com>
Subject: Re: linux-next: manual merge of the tty tree with the net-next tree
Date: Tue, 6 Apr 2021 11:11:53 +0200 [thread overview]
Message-ID: <YGwl2VvvGcmCciMn@kroah.com> (raw)
In-Reply-To: <20210406184814.3c958f51@canb.auug.org.au>
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
next prev parent reply other threads:[~2021-04-06 9:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 8:48 linux-next: manual merge of the tty tree with the net-next tree Stephen Rothwell
2021-04-06 9:11 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-09 3:40 Stephen Rothwell
2023-08-09 7:54 ` Greg KH
2023-08-09 3:37 Stephen Rothwell
2023-08-09 7:54 ` Greg KH
2012-03-09 6:02 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YGwl2VvvGcmCciMn@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=jirislaby@kernel.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=zhengyongjun3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox