From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Amit Shah <amit.shah@redhat•com>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree
Date: Thu, 24 Feb 2011 11:39:47 -0800 [thread overview]
Message-ID: <20110224193947.GA15044@kroah.com> (raw)
In-Reply-To: <20110224163439.05352f9b.sfr@canb.auug.org.au>
On Thu, Feb 24, 2011 at 04:34:39PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/char/Makefile between commit
> 51df0acc3d76cf41d5496ef044cc5717ab5c7f71 ("virtio: console: Move file
> back to drivers/char/") from Linus' tree and commit
> a6afd9f3e819de4795fcd356e5bfad446e4323f2 ("tty: move a number of tty
> drivers from drivers/char/ to drivers/tty/") (and later ones) from the tty
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, I've merge 2.6.38-rc6 into tty-next so this, and another merge
issue, should now be resolved.
greg k-h
next prev parent reply other threads:[~2011-02-24 19:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 5:34 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2011-02-24 19:39 ` Greg KH [this message]
2011-02-25 5:11 ` Stephen Rothwell
2011-02-25 5:48 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2011-10-25 8:12 Stephen Rothwell
2011-10-25 12:02 ` Greg KH
2011-10-25 8:18 Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2013-01-17 2:04 Stephen Rothwell
2013-01-18 0:41 ` Greg KH
2013-01-21 3:46 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` Greg KH
2014-05-05 5:41 Stephen Rothwell
2014-05-05 21:02 ` Greg KH
2016-05-20 2:31 Stephen Rothwell
2016-05-21 3:26 ` Greg KH
2020-03-10 3:40 Stephen Rothwell
2020-03-10 9:04 ` Greg KH
2020-03-10 10:52 ` Jiri Slaby
2020-03-16 6:38 ` Jiri Slaby
2020-03-16 7:46 ` Greg KH
2020-03-16 6:34 ` Jiri Slaby
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=20110224193947.GA15044@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=amit.shah@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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