From: Michael Ellerman <mpe@ellerman.id.au>
To: Paul Moore <paul@paul-moore.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>,
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: Re: linux-next: manual merge of the audit tree with the powerpc tree
Date: Wed, 27 Oct 2021 22:29:06 +1100 [thread overview]
Message-ID: <87tuh2aepp.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <CAHC9VhTj7gn3iAOYctVRKvv_Bk1iQMrmkA8FVJtYzdvBjqFmvg@mail.gmail.com>
Paul Moore <paul@paul-moore.com> writes:
> On Tue, Oct 26, 2021 at 6:55 AM Michael Ellerman <mpe@ellerman.id.au> wrote:
>> Stephen Rothwell <sfr@canb.auug.org.au> 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.
>
> Hi Michael,
>
> Last I recall from the powerpc/audit thread there were still some
> issues with audit working properly in your testing, has that been
> resolved?
No.
There's one test failure both before and after the conversion to use the
generic code.
> If nothing else, -rc7 seems a bit late for this to hit -next for me to
> feel comfortable about this.
OK. I'll revert the patch in my tree.
cheers
next prev parent reply other threads:[~2021-10-27 11:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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=87tuh2aepp.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman.id.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=paul@paul-moore.com \
--cc=rgb@redhat.com \
--cc=sfr@canb.auug.org.au \
/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).