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,
Jim Cromie <jim.cromie@gmail.com>,
Rusty Russell <rusty@rustcorp.com.au>,
Chris Metcalf <cmetcalf@tilera.com>
Subject: Re: linux-next: manual merge of the driver-core tree with Linus' tree
Date: Fri, 4 May 2012 16:19:12 -0700 [thread overview]
Message-ID: <20120504231912.GB9720@kroah.com> (raw)
In-Reply-To: <20120501150109.753d67c17e5beead1600c7ac@canb.auug.org.au>
On Tue, May 01, 2012 at 03:01:09PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> init/main.c between commit a99cd1125189 ("init: fix bug where environment
> vars can't be passed via boot args") from Linus' tree and commit
> 9fb48c744ba6 ("params: add 3rd arg to option handler callback signature")
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, this should now be resolved in my tree.
greg k-h
next prev parent reply other threads:[~2012-05-04 23:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-01 5:01 linux-next: manual merge of the driver-core tree with Linus' tree Stephen Rothwell
2012-05-01 13:46 ` Greg KH
2012-05-04 23:19 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-12-05 3:20 Stephen Rothwell
2025-12-05 3:26 ` Miguel Ojeda
2025-12-05 4:01 ` Stephen Rothwell
2015-08-07 5:26 Stephen Rothwell
2015-08-07 5:30 ` Viresh Kumar
2014-12-15 3:09 Stephen Rothwell
2013-01-23 4:15 Stephen Rothwell
2013-01-23 4:42 ` Greg KH
2012-01-30 2:24 Stephen Rothwell
2012-01-30 2:35 ` Greg KH
2012-02-02 19:26 ` Greg KH
2011-12-28 5:28 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2010-01-18 7:49 Stephen Rothwell
2010-01-19 20:59 ` Greg KH
2010-01-19 23:43 ` 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=20120504231912.GB9720@kroah.com \
--to=greg@kroah.com \
--cc=cmetcalf@tilera.com \
--cc=jim.cromie@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
/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).