From: Daniel Lezcano <daniel.lezcano@linaro•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Rafael J. Wysocki" <rjw@sisk•pl>
Subject: Re: linux-next: please cleanup the cpuidle tree
Date: Fri, 11 Jan 2013 10:10:12 +0100 [thread overview]
Message-ID: <50EFD6F4.7030903@linaro.org> (raw)
In-Reply-To: <20130111115608.dffec30f37e42a8f15a3f117@canb.auug.org.au>
On 01/11/2013 01:56 AM, Stephen Rothwell wrote:
> Hi Daniel,
>
> On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>
>> On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano <daniel.lezcano@linaro•org> wrote:
>>>
>>> On 01/07/2013 11:27 PM, Stephen Rothwell wrote:
>>>>
>>>> All the commits in the cpuidle tree have been included upstream before
>>>> v3.6-rc1. They were rewritten before being merged upstream and so are
>>>> now causing merge conflicts in linux-next. Could you please reset the
>>>> head of your tree
>>>> (git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
>>>> be somewhere in the tree that yours is merged into (pm or Linus').
>>>
>>> Sure. I believe it is done now.
>>
>> Yep, thanks.
>
> Unfortunately, you reset your tree to be a version of the pm tree that has
> now been rebased :-( This is now causing more conflicts in linux-next.
> Maybe you should reset your tree to be the same as one of Linus' -rc
> releases for now.
Ok, done.
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2013-01-11 9:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 22:27 linux-next: please cleanup the cpuidle tree Stephen Rothwell
2013-01-07 23:11 ` Daniel Lezcano
2013-01-07 23:22 ` Stephen Rothwell
2013-01-11 0:56 ` Stephen Rothwell
2013-01-11 9:10 ` Daniel Lezcano [this message]
2013-01-11 9:19 ` 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=50EFD6F4.7030903@linaro.org \
--to=daniel.lezcano@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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