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,
Rob Herring <rob.herring@calxeda.com>,
Grant Likely <grant.likely@secretlab.ca>,
Libo Chen <clbchenlibo.chen@huawei.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the devicetree tree
Date: Mon, 17 Jun 2013 12:58:16 -0700 [thread overview]
Message-ID: <20130617195816.GA28980@kroah.com> (raw)
In-Reply-To: <20130617153302.abd2024c094b8899904acb12@canb.auug.org.au>
On Mon, Jun 17, 2013 at 03:33:02PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/platform_device.h between commit 10dbc5e39a60 ("driver
> core: move to_platform_driver to platform_device.h") from the devicetree
> tree and commit 9447057eaff8 ("platform_device: use a macro instead of
> platform_driver_register") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2013-06-17 19:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 5:33 linux-next: manual merge of the driver-core tree with the devicetree tree Stephen Rothwell
2013-06-17 19:58 ` Greg KH [this message]
2020-07-06 3:23 Stephen Rothwell
2021-04-06 8:19 Stephen Rothwell
2021-04-06 9:11 ` Greg KH
2021-04-06 16:19 ` Saravana Kannan
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=20130617195816.GA28980@kroah.com \
--to=greg@kroah.com \
--cc=clbchenlibo.chen@huawei.com \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rob.herring@calxeda.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).