linux-kernel - Re: linux-next: manual merge of the security-testing tree with the arm 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: <20090914185500.fc9cf713.sfr@canb.auug.org.au>
Date:	Mon, 14 Sep 2009 18:55:00 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk+lkml@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mikael Pettersson <mikpe@...uu.se>,
	James Morris <jmorris@...ei.org>,
	David Howells <dhowells@...hat.com>
Subject: Re: linux-next: manual merge of the security-testing tree with the
 arm tree

On Mon, 14 Sep 2009 09:12:21 +0100 Russell King <rmk+lkml@....linux.org.uk> wrote:
>
> On Mon, Sep 14, 2009 at 01:03:55PM +1000, Stephen Rothwell wrote:
> > This is now a conflict between the arm tree and Linus' tree (as the
> > security-testing tree has been merged).
> 
> That's going to be a problem then - I've sent Linus a pull request last
> Saturday, and so my tree is now frozen pending a response from Linus.

You could, of course, send an email to Linus saying something like
"linux-next has shown that you will get a conflict in
arch/arm/kernel/signal.c when you merge the arm tree.  You could fix it
like this: ... or I could merge your tree and fix it locally and let you
know when it is done."

Actually Linus is probably clever enough to fix the conflict himself -
after all, I did :-)

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped