linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the audit tree with the powerpc tree
@ 2021-10-26  2:31 Stephen Rothwell
  2021-10-26 10:55 ` Michael Ellerman
  0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2021-10-26  2:31 UTC (permalink / raw)
  To: Paul Moore, Michael Ellerman, PowerPC
  Cc: Christophe Leroy, Linux Kernel Mailing List,
	Linux Next Mailing List, Richard Guy Briggs

[-- Attachment #1: Type: text/plain, Size: 906 bytes --]

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 fixed it up (I just removed the files like the former commit) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2022-01-12 17:19 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26  2:31 linux-next: manual merge of the audit tree with the powerpc tree Stephen Rothwell
2021-10-26 10:55 ` Michael Ellerman
2021-10-26 14:27   ` Paul Moore
2021-10-27 11:29     ` Michael Ellerman
2021-10-27 11:41       ` Christophe Leroy
2021-10-27 14:18         ` Paul Moore
2021-12-14 17:59           ` Christophe Leroy
2021-12-14 18:23             ` Paul Moore
2021-12-14 19:32               ` Christophe Leroy
2021-12-14 20:30                 ` Cédric Le Goater
2021-12-16  9:08                   ` Christophe Leroy
2021-12-16 23:04                     ` Paul Moore
2021-12-17 14:11                       ` Christophe Leroy
2022-01-12 17:19                         ` Paul Moore

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).