linux-kernel - Re: linux-next: please cleanup the cpuidle tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130111115608.dffec30f37e42a8f15a3f117@canb.auug.org.au>
Date:	Fri, 11 Jan 2013 11:56:08 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: Re: linux-next: please cleanup the cpuidle tree

Hi Daniel,

On Tue, 8 Jan 2013 10:22:27 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Tue, 08 Jan 2013 00:11:50 +0100 Daniel Lezcano <daniel.lezcano@...aro.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped