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@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
