All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Snitzer <snitzer@redhat.com>
To: Paul Moore <paul@paul-moore.com>
Cc: dm-devel@redhat.com, linux-audit@redhat.com,
	Alasdair Kergon <agk@redhat.com>
Subject: Re: [dm-devel] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
Date: Wed, 27 Oct 2021 16:57:49 -0400	[thread overview]
Message-ID: <YXm9Td5kTuMChvH3@redhat.com> (raw)
In-Reply-To: <CAHC9VhRFwSL99a3DNr5-6vKgD4w1YCvoVXZr9X=oAhhA6Zb5FQ@mail.gmail.com>

On Tue, Oct 26 2021 at 10:22P -0400,
Paul Moore <paul@paul-moore.com> wrote:

> On Tue, Oct 19, 2021 at 9:17 PM Paul Moore <paul@paul-moore.com> wrote:
> > On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul@paul-moore.com> wrote:
> > >
> > > Due to conflict with the audit and SELinux trees the device mapper
> > > audit record types need to be renumbered before landing in Linus'
> > > tree.
> > >
> > > Link: https://lore.kernel.org/lkml/CAHC9VhTLmzDQPqsj+vyBNua1X13UK_tTcixKZ7WWYEqMXVOXdQ@mail.gmail.com/
> > > Fixes: c1d7fa96e74b ("dm: introduce audit event module for device mapper")
> > > Signed-off-by: Paul Moore <paul@paul-moore.com>
> > > ---
> > >  include/uapi/linux/audit.h |    4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > Alasdair or Mike, please merge this into the device-mapper tree before
> > you send it to Linus during the upcoming merge window.
> 
> Please merge this fix into the device-mapper tree to fix a patch in
> the for-next branch, otherwise there is a chance for breakage due to
> potentially botched merges during the upcoming merge window.

I fixed it up.. via rebase, so we should be all set.

Thanks,
Mike

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


WARNING: multiple messages have this Message-ID (diff)
From: Mike Snitzer <snitzer@redhat.com>
To: Paul Moore <paul@paul-moore.com>
Cc: dm-devel@redhat.com, linux-audit@redhat.com,
	Alasdair Kergon <agk@redhat.com>
Subject: Re: audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
Date: Wed, 27 Oct 2021 16:57:49 -0400	[thread overview]
Message-ID: <YXm9Td5kTuMChvH3@redhat.com> (raw)
In-Reply-To: <CAHC9VhRFwSL99a3DNr5-6vKgD4w1YCvoVXZr9X=oAhhA6Zb5FQ@mail.gmail.com>

On Tue, Oct 26 2021 at 10:22P -0400,
Paul Moore <paul@paul-moore.com> wrote:

> On Tue, Oct 19, 2021 at 9:17 PM Paul Moore <paul@paul-moore.com> wrote:
> > On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul@paul-moore.com> wrote:
> > >
> > > Due to conflict with the audit and SELinux trees the device mapper
> > > audit record types need to be renumbered before landing in Linus'
> > > tree.
> > >
> > > Link: https://lore.kernel.org/lkml/CAHC9VhTLmzDQPqsj+vyBNua1X13UK_tTcixKZ7WWYEqMXVOXdQ@mail.gmail.com/
> > > Fixes: c1d7fa96e74b ("dm: introduce audit event module for device mapper")
> > > Signed-off-by: Paul Moore <paul@paul-moore.com>
> > > ---
> > >  include/uapi/linux/audit.h |    4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > Alasdair or Mike, please merge this into the device-mapper tree before
> > you send it to Linus during the upcoming merge window.
> 
> Please merge this fix into the device-mapper tree to fix a patch in
> the for-next branch, otherwise there is a chance for breakage due to
> potentially botched merges during the upcoming merge window.

I fixed it up.. via rebase, so we should be all set.

Thanks,
Mike

--
Linux-audit mailing list
Linux-audit@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-audit


  reply	other threads:[~2021-10-27 20:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-20  1:15 [dm-devel] [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering Paul Moore
2021-10-20  1:15 ` Paul Moore
2021-10-20  1:17 ` [dm-devel] " Paul Moore
2021-10-20  1:17   ` Paul Moore
2021-10-26 14:22   ` [dm-devel] " Paul Moore
2021-10-26 14:22     ` Paul Moore
2021-10-27 20:57     ` Mike Snitzer [this message]
2021-10-27 20:57       ` Mike Snitzer
2021-10-27 21:21       ` [dm-devel] " Paul Moore
2021-10-27 21:21         ` Paul Moore
2021-12-20 21:07         ` [dm-devel] " Richard Guy Briggs
2021-12-20 21:07           ` Richard Guy Briggs

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=YXm9Td5kTuMChvH3@redhat.com \
    --to=snitzer@redhat.com \
    --cc=agk@redhat.com \
    --cc=dm-devel@redhat.com \
    --cc=linux-audit@redhat.com \
    --cc=paul@paul-moore.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 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.