All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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 selinux tree
Date: Tue, 5 Oct 2021 09:58:55 -0400	[thread overview]
Message-ID: <CAHC9VhQxddE8b3F1giSXXWhY+YVrKh0HHtpe9KipSPYUMn8U=Q@mail.gmail.com> (raw)
In-Reply-To: <20211005141934.705eaa1c@canb.auug.org.au>

On Mon, Oct 4, 2021 at 11:19 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
>   include/uapi/linux/audit.h
>
> between commit:
>
>   5bd2182d58e9 ("audit,io_uring,io-wq: add some basic audit support to io_uring")
>
> from the selinux tree and commit:
>
>   571e5c0efcb2 ("audit: add OPENAT2 record to list "how" info")
>
> from the audit tree.

Thanks Stephen, your fix below is correct and I'll make sure to
mention this to Linus when sending the SELinux and audit trees to him
during the next merge window.

> diff --cc include/uapi/linux/audit.h
> index ecf1edd2affa,afa2472ad5d6..000000000000
> --- a/include/uapi/linux/audit.h
> +++ b/include/uapi/linux/audit.h
> @@@ -118,7 -118,7 +118,8 @@@
>   #define AUDIT_TIME_ADJNTPVAL  1333    /* NTP value adjustment */
>   #define AUDIT_BPF             1334    /* BPF subsystem */
>   #define AUDIT_EVENT_LISTENER  1335    /* Task joined multicast read socket */
>  +#define AUDIT_URINGOP         1336    /* io_uring operation */
> + #define AUDIT_OPENAT2         1337    /* Record showing openat2 how args */
>
>   #define AUDIT_AVC             1400    /* SE Linux avc denial or grant */
>   #define AUDIT_SELINUX_ERR     1401    /* Internal SE Linux Errors */

-- 
paul moore
www.paul-moore.com

  reply	other threads:[~2021-10-05 14:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-05  3:19 linux-next: manual merge of the audit tree with the selinux tree Stephen Rothwell
2021-10-05 13:58 ` Paul Moore [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-05-15  3:06 Stephen Rothwell
2018-05-15  3:16 ` Richard Guy Briggs
2018-05-15 20:18   ` 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='CAHC9VhQxddE8b3F1giSXXWhY+YVrKh0HHtpe9KipSPYUMn8U=Q@mail.gmail.com' \
    --to=paul@paul-moore.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.