On Tue, Oct 26 2021 at 10:22P -0400,
Paul Moore <paul(a)paul-moore.com> wrote:
On Tue, Oct 19, 2021 at 9:17 PM Paul Moore
<paul(a)paul-moore.com> wrote:
> On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul(a)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_tTcixKZ7WWYEq...
> > Fixes: c1d7fa96e74b ("dm: introduce audit event module for device
mapper")
> > Signed-off-by: Paul Moore <paul(a)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