From: Len Brown <lenb@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Lv Zheng <lv.zheng@intel•com>, "Rafael J. Wysocki" <rjw@sisk•pl>,
Daniel Lezcano <daniel.lezcano@linaro•org>
Subject: Re: linux-next: manual merge of the acpi tree with the pm tree
Date: Mon, 11 Feb 2013 18:34:06 -0500 [thread overview]
Message-ID: <51197FEE.9070606@kernel.org> (raw)
In-Reply-To: <20130211125856.64b216a03dd18218c4627635@canb.auug.org.au>
On 02/10/2013 08:58 PM, Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/acpi/processor_idle.c between commit 4f8429166818 ("ACPICA:
> Cleanup PM_TIMER_FREQUENCY definition") from the pm tree and commit
> 41cdb0efc42e ("ACPI / idle: remove unused definition") from the acpi tree.
>
> I fixed it up (The latter removed the lines modified by the former, so I
> did that) and can carry the fix as necessary (no action is required).
>
Thank you Stephen,
Go ahead and keep these two merge fix-ups.
We'll either merge the rjw and the lenb trees before
sending to Linus, or let him repeat your merge
fix-ups as he likes to do.
BTW. Rafael's "pm" tree now carries the ACPI patch stream,
so it is probably a mis-representation to call my tree the "acpi" tree.
My tree is primarily focused on the "idle" part of pm these days.
thanks,
Len Brown, Intel Open Source Technology Center
next prev parent reply other threads:[~2013-02-11 23:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 1:58 linux-next: manual merge of the acpi tree with the pm tree Stephen Rothwell
2013-02-11 23:34 ` Len Brown [this message]
2013-02-12 22:30 ` Stephen Rothwell
2013-02-17 7:31 ` Zheng, Lv
-- strict thread matches above, loose matches on Subject: below --
2013-02-11 1:59 Stephen Rothwell
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=51197FEE.9070606@kernel.org \
--to=lenb@kernel$(echo .)org \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lv.zheng@intel$(echo .)com \
--cc=rjw@sisk$(echo .)pl \
--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