Re: linux-next: manual merge of the audit tree with Linus' tree
From: Paul Moore
Date: Mon Jan 18 2016 - 21:48:36 EST
On Mon, Jan 18, 2016 at 8:02 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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