From: "Rafael J. Wysocki" <rjw@rjwysocki•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Russell King <linux@arm•linux.org.uk>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Krzysztof Kozlowski <k.kozlowski@samsung•com>
Subject: Re: linux-next: manual merge of the pm tree with the arm tree
Date: Wed, 03 Dec 2014 02:45:35 +0100 [thread overview]
Message-ID: <2220221.lsImPz8V5G@vostro.rjw.lan> (raw)
In-Reply-To: <20141203121235.3eabd77b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
On Wednesday, December 03, 2014 12:12:35 PM Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the pm tree got a conflict in
> include/linux/pm_runtime.h between commit 3fb1581ea1ab ("ARM: 8199/1:
> PM / Runtime: Add getter for querying the IRQ safe option v12") from
> the arm tree and commit 6d14dd40f550 ("PM: Drop CONFIG_PM_RUNTIME from
> the driver core") from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks OK to me, thanks!
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-12-03 1:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 1:12 linux-next: manual merge of the pm tree with the arm tree Stephen Rothwell
2014-12-03 1:45 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-25 3:30 Stephen Rothwell
2011-08-25 14:28 ` Rafael J. Wysocki
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=2220221.lsImPz8V5G@vostro.rjw.lan \
--to=rjw@rjwysocki$(echo .)net \
--cc=k.kozlowski@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/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