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,
Robin Getz <rgetz@blackfin.uclinux.org>,
Jason Wessel <jason.wessel@windriver.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the usb tree with the tip tree
Date: Wed, 19 Aug 2009 16:38:18 -0700 [thread overview]
Message-ID: <20090819233818.GD2875@kroah.com> (raw)
In-Reply-To: <20090819175901.59f1af9e.sfr@canb.auug.org.au>
On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
> ("printk: Enable the use of more than one CON_BOOT (early console)") from
> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
> printk: early_printk,console: Allow more than one early console") from
> the usb tree.
>
> I assume that these are trying to do (more or less) the same thing. I
> have dropped the one from the usb tree for today. Please sort this out -
> at least remove the usb tree one until you have done so, thanks.
Jason, any thoughts? I'm going to drop your printk stuff from my tree
now, care to sort it out and resend your whole series?
thanks,
greg k-h
next prev parent reply other threads:[~2009-08-19 23:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-19 7:59 linux-next: manual merge of the usb tree with the tip tree Stephen Rothwell
2009-08-19 23:38 ` Greg KH [this message]
2009-08-20 2:37 ` Jason Wessel
2009-08-20 2:48 ` Greg KH
2009-08-20 5:57 ` Peter Zijlstra
2009-08-20 19:31 ` Jason Wessel
2009-08-20 10:35 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2014-03-17 7:31 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2014-03-17 7:34 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2016-03-09 2:35 Stephen Rothwell
2016-03-09 4:17 ` Greg KH
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=20090819233818.GD2875@kroah.com \
--to=greg@kroah.com \
--cc=hpa@zytor.com \
--cc=jason.wessel@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rgetz@blackfin.uclinux.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).