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 11:56:08 +1100 [thread overview]
Message-ID: <20130111115608.dffec30f37e42a8f15a3f117@canb.auug.org.au> (raw)
In-Reply-To: <20130108102227.19d4102cb1ddf516ad4082d1@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-01-11 0:56 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 [this message]
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=20130111115608.dffec30f37e42a8f15a3f117@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®