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
Subject: Re: linux-next: please cleanup the cpuidle tree
Date: Tue, 08 Jan 2013 00:11:50 +0100 [thread overview]
Message-ID: <50EB5636.4080705@linaro.org> (raw)
In-Reply-To: <20130108092751.4bd60a67280e284369553c18@canb.auug.org.au>
On 01/07/2013 11:27 PM, Stephen Rothwell wrote:
> Hi Daniel,
>
> 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.
> Alternatively, if you are not using it any more, let me know and I will
> remove it from linux-next.
I am planning to do some more cleanup in a very near future. So I prefer
to keep it untouched for now.
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-07 23:11 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 [this message]
2013-01-07 23:22 ` Stephen Rothwell
2013-01-11 0:56 ` Stephen Rothwell
2013-01-11 9:10 ` Daniel Lezcano
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=50EB5636.4080705@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.