From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>,
Michael Ellerman <mpe@ellerman.id.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Richard Guy Briggs <rgb@redhat.com>
Subject: linux-next: manual merge of the audit tree with the powerpc tree
Date: Tue, 26 Oct 2021 13:31:47 +1100 [thread overview]
Message-ID: <20211026133147.35d19e00@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2021-10-26 2:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 2:31 Stephen Rothwell [this message]
2021-10-26 10:55 ` linux-next: manual merge of the audit tree with the powerpc tree 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211026133147.35d19e00@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christophe.leroy@csgroup.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paul@paul-moore.com \
--cc=rgb@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).