[lkml]   [2021]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the audit tree with the powerpc tree
Stephen Rothwell <> 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.


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.


 \ /
  Last update: 2021-10-26 12:55    [W:0.060 / U:4.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site