Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:
> Hi all,
>
> Today's linux-next merge of the audit tree got conflicts in:
>
> arch/powerpc/kernel/audit.c
> arch/powerpc/kernel/compat_audit.c
>
> between commit:
>
> 566af8cda399 ("powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC")
>
> from the powerpc tree and commits:
>
> 42f355ef59a2 ("audit: replace magic audit syscall class numbers with macros")
> 1c30e3af8a79 ("audit: add support for the openat2 syscall")
>
> from the audit tree.
Thanks.
I guess this is OK, unless the audit folks disagree. I could revert the
powerpc commit and try it again later.
If I don't hear anything I'll leave it as-is.
cheers
