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,
David Woodhouse <dwmw2@infradead.org>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the firmware tree
Date: Wed, 3 Jun 2009 07:58:33 -0700 [thread overview]
Message-ID: <20090603145833.GA30890@kroah.com> (raw)
In-Reply-To: <20090603172307.ea2f6f41.sfr@canb.auug.org.au>
On Wed, Jun 03, 2009 at 05:23:07PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/firmware_class.c between commit
> 6e03a201bbe8137487f340d26aa662110e324b20 ("firmware: speed up
> request_firmware(), v3") from the firmware tree and commit
> ffceb90f9b59a5186b3ce9177bfebf8819b7735a ("firmware: allocate firmware id
> dynamically") from the driver-core tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks for the fixup, this looks like something we can handle when we
merge with Linus.
greg k-h
prev parent reply other threads:[~2009-06-03 15:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-03 7:23 linux-next: manual merge of the driver-core tree with the firmware tree Stephen Rothwell
2009-06-03 14:58 ` Greg KH [this message]
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=20090603145833.GA30890@kroah.com \
--to=greg@kroah.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--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).