* linux-next: manual merge of the audit tree with the vfs-brauner tree
@ 2026-03-11 12:21 Mark Brown
2026-03-11 15:57 ` Paul Moore
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-03-11 12:21 UTC (permalink / raw)
To: Paul Moore
Cc: Christian Brauner, Jeff Layton, Linux Kernel Mailing List,
Linux Next Mailing List, Ricardo Robaina
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]
Hi all,
Today's linux-next merge of the audit tree got a conflict in:
include/linux/audit.h
between commit:
125dfa218134d ("audit: widen ino fields to u64")
from the vfs-brauner tree and commit:
360160f75592b ("audit: handle unknown status requests in audit_receive_msg()")
from the audit tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc include/linux/audit.h
index b915aaa7ed739,d79218bf075a0..0000000000000
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@@ -15,7 -15,16 +15,16 @@@
#include <uapi/linux/audit.h>
#include <uapi/linux/fanotify.h>
+ #define AUDIT_STATUS_ALL (AUDIT_STATUS_ENABLED | \
+ AUDIT_STATUS_FAILURE | \
+ AUDIT_STATUS_PID | \
+ AUDIT_STATUS_RATE_LIMIT | \
+ AUDIT_STATUS_BACKLOG_LIMIT | \
+ AUDIT_STATUS_BACKLOG_WAIT_TIME | \
+ AUDIT_STATUS_LOST | \
+ AUDIT_STATUS_BACKLOG_WAIT_TIME_ACTUAL)
+
-#define AUDIT_INO_UNSET ((unsigned long)-1)
+#define AUDIT_INO_UNSET ((u64)-1)
#define AUDIT_DEV_UNSET ((dev_t)-1)
struct audit_sig_info {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the audit tree with the vfs-brauner tree
2026-03-11 12:21 linux-next: manual merge of the audit tree with the vfs-brauner tree Mark Brown
@ 2026-03-11 15:57 ` Paul Moore
0 siblings, 0 replies; 2+ messages in thread
From: Paul Moore @ 2026-03-11 15:57 UTC (permalink / raw)
To: Mark Brown
Cc: Christian Brauner, Jeff Layton, Linux Kernel Mailing List,
Linux Next Mailing List, Ricardo Robaina
On Wed, Mar 11, 2026 at 8:21 AM Mark Brown <broonie@kernel•org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> include/linux/audit.h
>
> between commit:
>
> 125dfa218134d ("audit: widen ino fields to u64")
>
> from the vfs-brauner tree and commit:
>
> 360160f75592b ("audit: handle unknown status requests in audit_receive_msg()")
>
> from the audit tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc include/linux/audit.h
> index b915aaa7ed739,d79218bf075a0..0000000000000
> --- a/include/linux/audit.h
> +++ b/include/linux/audit.h
> @@@ -15,7 -15,16 +15,16 @@@
> #include <uapi/linux/audit.h>
> #include <uapi/linux/fanotify.h>
>
> + #define AUDIT_STATUS_ALL (AUDIT_STATUS_ENABLED | \
> + AUDIT_STATUS_FAILURE | \
> + AUDIT_STATUS_PID | \
> + AUDIT_STATUS_RATE_LIMIT | \
> + AUDIT_STATUS_BACKLOG_LIMIT | \
> + AUDIT_STATUS_BACKLOG_WAIT_TIME | \
> + AUDIT_STATUS_LOST | \
> + AUDIT_STATUS_BACKLOG_WAIT_TIME_ACTUAL)
> +
> -#define AUDIT_INO_UNSET ((unsigned long)-1)
> +#define AUDIT_INO_UNSET ((u64)-1)
> #define AUDIT_DEV_UNSET ((dev_t)-1)
>
> struct audit_sig_info {
That looks correct, thanks Mark.
--
paul-moore.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-03-11 15:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-11 12:21 linux-next: manual merge of the audit tree with the vfs-brauner tree Mark Brown
2026-03-11 15:57 ` Paul Moore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox