lkml.org 
[lkml]   [2016]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the audit tree with Linus' tree
Hi Paul,

Today's linux-next merge of the audit tree got a conflict in:

kernel/audit.c

between commit:

f48a942926c5 ("audit: include auditd's threads in audit_log_start() wait exception")

from Linus' tree and commit:

14eeba1d242e ("audit: include auditd's threads in audit_log_start() wait exception")

from the audit tree.

This happened because the audit tree was rebased before being sent
to Linus and this patch was "tweaked". I just used the version from
Linus' tree. Please clean up the audit tree.

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

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