From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the tty tree
Date: Fri, 29 Jan 2021 08:34:14 +0100 [thread overview]
Message-ID: <YBO6dpug0zkHcdE9@kroah.com> (raw)
In-Reply-To: <20210129155341.1868ef9e@canb.auug.org.au>
On Fri, Jan 29, 2021 at 03:53:41PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in:
>
> drivers/tty/n_tracerouter.c
> drivers/tty/n_tracesink.c
>
> between commit:
>
> 3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer")
>
> from the tty tree and commit:
>
> 8ba59e9dee31 ("misc: pti: Remove driver for deprecated platform")
>
> from the char-misc tree.
Thanks, I knew this would happen :(
next prev parent reply other threads:[~2021-01-29 7:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 4:53 linux-next: manual merge of the char-misc tree with the tty tree Stephen Rothwell
2021-01-29 7:34 ` Greg KH [this message]
2021-02-14 22:03 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-02-11 5:37 Stephen Rothwell
2013-02-11 14:37 ` Greg KH
2013-01-17 2:54 Stephen Rothwell
2013-01-17 9:40 ` Samuel Iglesias Gonsalvez
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=YBO6dpug0zkHcdE9@kroah.com \
--to=greg@kroah.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).