linux-next: manual merge of the audit tree with Linus' tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the audit tree with Linus' tree
Date	2016-01-19 02:10 +0100
Message-ID	<qSsY2-sr-17@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the audit tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-19 02:10 +0100
  Re: linux-next: manual merge of the audit tree with Linus' tree Paul Moore <paul@paul-moore.com> - 2016-01-19 03:50 +0100

csiph-web