linux-kernel - Re: linux-next: Tree for Feb 4

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]

Date:	Tue, 5 Feb 2013 07:33:12 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Hogan <james.hogan@...tec.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexander Viro <viro@...iv.linux.org.uk>
Subject: Re: linux-next: Tree for Feb 4

Hi James,

On Mon, 4 Feb 2013 13:56:32 +0000 James Hogan <james.hogan@...tec.com> wrote:
>
> On 4 February 2013 07:39, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> > Merging signal/for-next (9005965 x86: convert to ksignal)
> > CONFLICT (content): Merge conflict in arch/x86/Kconfig
> 
> I think this conflict has been resolved incorrectly.
> 
> Al's commit 1820f96 "burying unused conditionals" removed
> GENERIC_SIGALTSTACK from config X86, but the merge
> (c5395e2affed5c42200cb6e21e3380995ef22ae3) left GENERIC_SIGALTSTACK
> in:

Thanks, I will fix that today.

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

Content of type "application/pgp-signature" skipped