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 -- 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
