From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
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 20:19:43 +1100 [thread overview]
Message-ID: <20130111201943.f928f64c870ee5d2cedbf410@canb.auug.org.au> (raw)
In-Reply-To: <50EFD6F4.7030903@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi Daniel,
On Fri, 11 Jan 2013 10:10:12 +0100 Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> On 01/11/2013 01:56 AM, Stephen Rothwell wrote:
> >
> > 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-01-11 9:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 22:27 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
2013-01-11 9:19 ` Stephen Rothwell [this message]
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=20130111201943.f928f64c870ee5d2cedbf410@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®