All of lore.kernel.org
 help / color / mirror / Atom feed
* [dm-devel] [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
@ 2021-10-20  1:15 ` Paul Moore
  0 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-20  1:15 UTC (permalink / raw)
  To: dm-devel, linux-audit; +Cc: Mike Snitzer, Alasdair Kergon

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(-)

diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index 6650ab6def2a..809e4c2041b3 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -118,8 +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_DM_CTRL		1336	/* Device Mapper target control */
-#define AUDIT_DM_EVENT		1337	/* Device Mapper events */
+#define AUDIT_DM_CTRL		1338	/* Device Mapper target control */
+#define AUDIT_DM_EVENT		1339	/* Device Mapper events */
 
 #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */

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


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

* [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
@ 2021-10-20  1:15 ` Paul Moore
  0 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-20  1:15 UTC (permalink / raw)
  To: dm-devel, linux-audit; +Cc: Mike Snitzer, Alasdair Kergon

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(-)

diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index 6650ab6def2a..809e4c2041b3 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -118,8 +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_DM_CTRL		1336	/* Device Mapper target control */
-#define AUDIT_DM_EVENT		1337	/* Device Mapper events */
+#define AUDIT_DM_CTRL		1338	/* Device Mapper target control */
+#define AUDIT_DM_EVENT		1339	/* Device Mapper events */
 
 #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */

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


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

* Re: [dm-devel] [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
  2021-10-20  1:15 ` Paul Moore
@ 2021-10-20  1:17   ` Paul Moore
  -1 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-20  1:17 UTC (permalink / raw)
  To: Alasdair Kergon, Mike Snitzer; +Cc: dm-devel, linux-audit

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.

> diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> index 6650ab6def2a..809e4c2041b3 100644
> --- a/include/uapi/linux/audit.h
> +++ b/include/uapi/linux/audit.h
> @@ -118,8 +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_DM_CTRL          1336    /* Device Mapper target control */
> -#define AUDIT_DM_EVENT         1337    /* Device Mapper events */
> +#define AUDIT_DM_CTRL          1338    /* Device Mapper target control */
> +#define AUDIT_DM_EVENT         1339    /* Device Mapper events */
>
>  #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

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


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

* Re: [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
@ 2021-10-20  1:17   ` Paul Moore
  0 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-20  1:17 UTC (permalink / raw)
  To: Alasdair Kergon, Mike Snitzer; +Cc: dm-devel, linux-audit

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.

> diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> index 6650ab6def2a..809e4c2041b3 100644
> --- a/include/uapi/linux/audit.h
> +++ b/include/uapi/linux/audit.h
> @@ -118,8 +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_DM_CTRL          1336    /* Device Mapper target control */
> -#define AUDIT_DM_EVENT         1337    /* Device Mapper events */
> +#define AUDIT_DM_CTRL          1338    /* Device Mapper target control */
> +#define AUDIT_DM_EVENT         1339    /* Device Mapper events */
>
>  #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

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


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

* Re: [dm-devel] [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
  2021-10-20  1:17   ` Paul Moore
@ 2021-10-26 14:22     ` Paul Moore
  -1 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-26 14:22 UTC (permalink / raw)
  To: Alasdair Kergon, Mike Snitzer; +Cc: dm-devel, linux-audit

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.

> > diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> > index 6650ab6def2a..809e4c2041b3 100644
> > --- a/include/uapi/linux/audit.h
> > +++ b/include/uapi/linux/audit.h
> > @@ -118,8 +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_DM_CTRL          1336    /* Device Mapper target control */
> > -#define AUDIT_DM_EVENT         1337    /* Device Mapper events */
> > +#define AUDIT_DM_CTRL          1338    /* Device Mapper target control */
> > +#define AUDIT_DM_EVENT         1339    /* Device Mapper events */
> >
> >  #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

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


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

* Re: [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
@ 2021-10-26 14:22     ` Paul Moore
  0 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-26 14:22 UTC (permalink / raw)
  To: Alasdair Kergon, Mike Snitzer; +Cc: dm-devel, linux-audit

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.

> > diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> > index 6650ab6def2a..809e4c2041b3 100644
> > --- a/include/uapi/linux/audit.h
> > +++ b/include/uapi/linux/audit.h
> > @@ -118,8 +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_DM_CTRL          1336    /* Device Mapper target control */
> > -#define AUDIT_DM_EVENT         1337    /* Device Mapper events */
> > +#define AUDIT_DM_CTRL          1338    /* Device Mapper target control */
> > +#define AUDIT_DM_EVENT         1339    /* Device Mapper events */
> >
> >  #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

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


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

* Re: [dm-devel] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
  2021-10-26 14:22     ` Paul Moore
@ 2021-10-27 20:57       ` Mike Snitzer
  -1 siblings, 0 replies; 12+ messages in thread
From: Mike Snitzer @ 2021-10-27 20:57 UTC (permalink / raw)
  To: Paul Moore; +Cc: dm-devel, linux-audit, Alasdair Kergon

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


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

* Re: audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
@ 2021-10-27 20:57       ` Mike Snitzer
  0 siblings, 0 replies; 12+ messages in thread
From: Mike Snitzer @ 2021-10-27 20:57 UTC (permalink / raw)
  To: Paul Moore; +Cc: dm-devel, linux-audit, Alasdair Kergon

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


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

* Re: [dm-devel] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
  2021-10-27 20:57       ` Mike Snitzer
@ 2021-10-27 21:21         ` Paul Moore
  -1 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-27 21:21 UTC (permalink / raw)
  To: Mike Snitzer; +Cc: dm-devel, linux-audit, Alasdair Kergon

On Wed, Oct 27, 2021 at 4:57 PM Mike Snitzer <snitzer@redhat.com> wrote:
>
> 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.

Great, thanks Mike.

-- 
paul moore
www.paul-moore.com

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


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

* Re: audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
@ 2021-10-27 21:21         ` Paul Moore
  0 siblings, 0 replies; 12+ messages in thread
From: Paul Moore @ 2021-10-27 21:21 UTC (permalink / raw)
  To: Mike Snitzer; +Cc: dm-devel, linux-audit, Alasdair Kergon

On Wed, Oct 27, 2021 at 4:57 PM Mike Snitzer <snitzer@redhat.com> wrote:
>
> 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.

Great, thanks Mike.

-- 
paul moore
www.paul-moore.com

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


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

* Re: [dm-devel] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
  2021-10-27 21:21         ` Paul Moore
@ 2021-12-20 21:07           ` Richard Guy Briggs
  -1 siblings, 0 replies; 12+ messages in thread
From: Richard Guy Briggs @ 2021-12-20 21:07 UTC (permalink / raw)
  To: Paul Moore; +Cc: dm-devel, linux-audit, Alasdair Kergon, Mike Snitzer

On 2021-10-27 17:21, Paul Moore wrote:
> On Wed, Oct 27, 2021 at 4:57 PM Mike Snitzer <snitzer@redhat.com> wrote:
> >
> > 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.
> 
> Great, thanks Mike.

The code got updated, which is the important part, but the description
didn't.  :-/

> paul moore

- RGB

--
Richard Guy Briggs <rgb@redhat.com>
Sr. S/W Engineer, Kernel Security, Base Operating Systems
Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635

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


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

* Re: audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering
@ 2021-12-20 21:07           ` Richard Guy Briggs
  0 siblings, 0 replies; 12+ messages in thread
From: Richard Guy Briggs @ 2021-12-20 21:07 UTC (permalink / raw)
  To: Paul Moore; +Cc: dm-devel, linux-audit, Alasdair Kergon, Mike Snitzer

On 2021-10-27 17:21, Paul Moore wrote:
> On Wed, Oct 27, 2021 at 4:57 PM Mike Snitzer <snitzer@redhat.com> wrote:
> >
> > 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.
> 
> Great, thanks Mike.

The code got updated, which is the important part, but the description
didn't.  :-/

> paul moore

- RGB

--
Richard Guy Briggs <rgb@redhat.com>
Sr. S/W Engineer, Kernel Security, Base Operating Systems
Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635

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


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

end of thread, other threads:[~2021-12-21  9:11 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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     ` [dm-devel] " Mike Snitzer
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

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.