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,
Bill Pemberton <wfp5p@virginia.edu>,
Fabio Estevam <fabio.estevam@freescale.com>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the mfd tree
Date: Wed, 28 Nov 2012 21:19:26 -0800 [thread overview]
Message-ID: <20121129051926.GH4375@kroah.com> (raw)
In-Reply-To: <20121129151804.a133338f9738b25d3ccf2e6f@canb.auug.org.au>
On Thu, Nov 29, 2012 at 03:18:04PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/power/da9052-battery.c between commit 4b5edf7887c6 ("power:
> da9052-battery: Convert to the new da9052 interrupt functions") from the
> mfd tree and commit c8afa6406e60 ("power: remove use of __devinit") from
> the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2012-11-29 5:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-29 4:18 linux-next: manual merge of the driver-core tree with the mfd tree Stephen Rothwell
2012-11-29 5:19 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 4:24 Stephen Rothwell
2014-11-10 4:39 ` Greg KH
2012-11-29 4:00 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:57 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:50 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:47 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:43 Stephen Rothwell
2012-11-29 5:21 ` Greg KH
2010-09-14 2:25 Stephen Rothwell
2010-09-14 4:09 ` 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=20121129051926.GH4375@kroah.com \
--to=greg@kroah.com \
--cc=fabio.estevam@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
--cc=wfp5p@virginia.edu \
/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).