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>,
"Rajanikanth H.V" <rajanikanth.hv@stericsson.com>,
Anton Vorontsov <avorontsov@ru.mvista.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the battery tree
Date: Wed, 28 Nov 2012 21:20:05 -0800 [thread overview]
Message-ID: <20121129052005.GL4375@kroah.com> (raw)
In-Reply-To: <20121129150933.6c47da49d1bae2cbf94f94da@canb.auug.org.au>
On Thu, Nov 29, 2012 at 03:09:33PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/power/ab8500_btemp.c between commit bd9e8ab2d58d ("ab8500: Add
> devicetree support for btemp") from the battery 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:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-29 4:09 linux-next: manual merge of the driver-core tree with the battery tree Stephen Rothwell
2012-11-29 5:20 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 4:11 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:13 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:15 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2012-11-29 4:20 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2022-02-14 2:48 Stephen Rothwell
2022-02-14 5:14 ` Greg KH
2022-02-21 19:11 broonie
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=20121129052005.GL4375@kroah.com \
--to=greg@kroah.com \
--cc=avorontsov@ru.mvista.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rajanikanth.hv@stericsson.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).