linux-kernel - Re: linux-next: manual merge of the security-testing tree with the parisc 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] [day] [month] [year] [list]

Message-ID: <20090914134927.GF19494@bombadil.infradead.org>
Date:	Mon, 14 Sep 2009 09:49:27 -0400
From:	Kyle McMartin <kyle@...artin.ca>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Kyle McMartin <kyle@...artin.ca>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>,
	James Morris <jmorris@...ei.org>, linux-parisc@...r.kernel.org
Subject: Re: linux-next: manual merge of the security-testing tree with the
	parisc tree

On Mon, Sep 14, 2009 at 03:35:32PM +1000, Stephen Rothwell wrote:
> Hi Kyle,
> > Overlapping changes.  I fixed it up (using the parisc versions and adding
> > the extra change from the latter security-testing patch) and can carry
> > the fixes as necessary.
> 
> This conflict is now between the parisc tree and Linus' tree ...
> 

You don't say.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/