lkml.org 
[lkml]   [2016]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the audit tree with Linus' tree
From
On Mon, Jan 18, 2016 at 8:02 PM, Stephen Rothwell <sfr@canb.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

\
 
 \ /
  Last update: 2016-01-19 04:21    [W:0.019 / U:29.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site