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-next>] [day] [month] [year] [list]
Message-Id: <20130108092751.4bd60a67280e284369553c18@canb.auug.org.au>
Date:	Tue, 8 Jan 2013 09:27:51 +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
Subject: linux-next: please cleanup the cpuidle tree

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').

Alternatively, if you are not using it any more, let me know and I will
remove it from linux-next.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ