linux-kernel - Re: linux-next: manual merge of the audit tree with Linus' 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: <CAHC9VhSF=Eh1j9LE=Xo4bz7R=Wx_+a7RYNVyRzKLNNnH2D43RA@mail.gmail.com>
Date:	Mon, 18 Jan 2016 21:48:30 -0500
From:	Paul Moore <paul@...l-moore.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Richard Guy Briggs <rgb@...hat.com>,
	Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the audit tree with Linus' tree

On Mon, Jan 18, 2016 at 8:02 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
>   kernel/audit.c

Fixed.

-- 
paul moore
www.paul-moore.com