From: "Rafael J. Wysocki" <rjw@rjwysocki•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Len Brown <lenb@kernel•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the idle tree with the pm tree
Date: Fri, 15 Nov 2013 16:22:45 +0100 [thread overview]
Message-ID: <2690209.ruZJYkdcbR@vostro.rjw.lan> (raw)
In-Reply-To: <20131115122329.1479981f032f0f863c786c84@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
On Friday, November 15, 2013 12:23:29 PM Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the idle tree got a conflict in
> drivers/idle/intel_idle.c between commit fab04b2208dd ("intel_idle:
> Support Intel Atom Processor C2000 Product Family") from the pm tree and
> commit 0654c50d7a0b ("intel_idle: Support Intel Atom Processor C2000
> Product Family") from the idle tree.
>
> I fixed it up (I used the version from the pm tree since it was much
> newer) and can carry the fix as necessary (no action is required).
Thanks for fixing this up!
Rafael
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-11-15 15:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-15 1:23 linux-next: manual merge of the idle tree with the pm tree Stephen Rothwell
2013-11-15 15:22 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-17 1:54 Stephen Rothwell
2015-04-14 2:47 Stephen Rothwell
2015-04-14 11:54 ` 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=2690209.ruZJYkdcbR@vostro.rjw.lan \
--to=rjw@rjwysocki$(echo .)net \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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