From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, "Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wolfram Sang <wsa@the-dreams•de>,
Mika Westerberg <mika.westerberg@linux•intel.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the tree
Date: Mon, 10 Nov 2014 15:36:53 +1100 [thread overview]
Message-ID: <20141110153653.5438f292@canb.auug.org.au> (raw)
In-Reply-To: <20141110152125.73e33634@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
Hi all,
On Mon, 10 Nov 2014 15:21:25 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio:
> Make use of device property API") from the tree and commit
> 81902d5f658f ("leds: drop owner assignment from platform_drivers") from
> the driver-core tree.
This involved the pm tree, of course.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-11-10 4:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 4:21 linux-next: manual merge of the driver-core tree with the tree Stephen Rothwell
2014-11-10 4:36 ` Stephen Rothwell [this message]
2014-11-10 4:40 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2013-02-15 5:01 Stephen Rothwell
2013-02-15 5:24 ` Greg KH
2013-02-15 17:04 ` Larry Finger
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=20141110153653.5438f292@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mika.westerberg@linux$(echo .)intel.com \
--cc=rjw@rjwysocki$(echo .)net \
--cc=wsa@the-dreams$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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