linux-kernel - Re: linux-next: unusual update of the security 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]

Date:	Fri, 7 Dec 2012 08:27:30 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Morris <jmorris@...ei.org>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Casey Schaufler <casey@...aufler-ca.com>,
	linux-next@...r.kernel.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: unusual update of the security tree

Hi James,

On Thu, 6 Dec 2012 08:25:21 -0800 Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
> Have people pulled that thing into anything else? Because quite
> frankly, I think it's unsalvageable except with a rebase.

So to be explicit, I think you need to do this:

	- tell as many people as possible that you are going to rebase
	  your tree
	- reset your tree back to the point just before you pulled Casey's
	  tree (3f0cc6ae8662).
	- Casey needs to rebase his tree on top of yours
	- then after Casey has tested his tree again you can repull his
	  new tree.

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

Content of type "application/pgp-signature" skipped