public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel•org>
To: Christian Brauner <brauner@kernel•org>,
	Dorjoy Chowdhury <dorjoychy111@gmail•com>,
	Jeff Layton <jlayton@kernel•org>,
	Aleksa Sarai <aleksa@amutable•com>,
	Jori Koolstra <jkoolstra@xs4all•nl>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the vfs-brauner tree
Date: Mon, 18 May 2026 11:47:24 +0100	[thread overview]
Message-ID: <agruPPybCx8q2XcJ@sirena.org.uk> (raw)

[-- Attachment #1: Type: text/plain, Size: 3954 bytes --]

Hi all,

After merging the vfs-brauner tree, today's linux-next build (arm64
allnoconfig) failed like this:

In file included from <command-line>:
/tmp/next/build/fs/fcntl.c: In function 'fcntl_init':
/tmp/next/build/include/linux/compiler_types.h:699:45: error: call to
'__compiletime_assert_614' declared with attribute error: BUILD_BUG_ON
failed: 21 - 1 != HWEIGHT32( (VALID_OPENAT2_FLAGS & ~(O_NONBLOCK |
O_NDELAY)) | __FMODE_EXEC)
  699 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |                                             ^
/tmp/next/build/include/linux/compiler_types.h:680:25: note: in definition
of macro '__compiletime_assert'
  680 |                         prefix ## suffix();                             \
      |                         ^~~~~~
/tmp/next/build/include/linux/compiler_types.h:699:9: note: in expansion
of macro '_compiletime_assert'
  699 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |         ^~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/build_bug.h:40:37: note: in expansion of
macro 'compiletime_assert'
   40 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
      |                                     ^~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/build_bug.h:51:9: note: in expansion of
macro 'BUILD_BUG_ON_MSG'
   51 |         BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
      |         ^~~~~~~~~~~~~~~~
/tmp/next/build/fs/fcntl.c:1172:9: note: in expansion of macro
'BUILD_BUG_ON'
 1172 |         BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ !=
      |         ^~~~~~~~~~~~

Caused by commits

  3adfed795a99d (openat2: new OPENAT2_REGULAR flag support)
  6703991ad3a35 (vfs: add O_EMPTYPATH to openat(2)/openat2(2))

interacting with each other.  Due to complex conflcits with netfs on the
old vfs-brauner tree I have applied the following fixup but since both
commits are coming from the vfs-brauner tree it's really not a merge
fixup:

From db4170bfa75dbd45e3f2e1a03f98c512fb2409b7 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel•org>
Date: Mon, 18 May 2026 11:26:07 +0100
Subject: [PATCH] openat: Fix collision between OPENAT2_REGULAR and O_EMPTYPATH

The commits

  3adfed795a99d (openat2: new OPENAT2_REGULAR flag support)
  6703991ad3a35 (vfs: add O_EMPTYPATH to openat(2)/openat2(2))

both defined new flags for openat2() but used the same numeric value for
them, with the second commit also using a different style for
specifying the flag (shifting rather than using an absolute value),
triggering build failures.  Deduplicate the defintions.

Fixes: 6703991ad3a35 ("vfs: add O_EMPTYPATH to openat(2)/openat2(2)")
Signed-off-by: Mark Brown <broonie@kernel•org>
---
 fs/fcntl.c                       | 2 +-
 include/uapi/asm-generic/fcntl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 240bb511557a1..7e953d4a807de 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -1169,7 +1169,7 @@ static int __init fcntl_init(void)
 	 * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY
 	 * is defined as O_NONBLOCK on some platforms and not on others.
 	 */
-	BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ !=
+	BUILD_BUG_ON(22 - 1 /* for O_RDONLY being 0 */ !=
 		HWEIGHT32(
 			(VALID_OPENAT2_FLAGS & ~(O_NONBLOCK | O_NDELAY)) |
 			__FMODE_EXEC));
diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
index 3c6062007b26f..c4b0e7153fa87 100644
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
@@ -93,7 +93,7 @@
 #endif
 
 #ifndef O_EMPTYPATH
-#define O_EMPTYPATH	(1 << 26)	/* allow empty path */
+#define O_EMPTYPATH	0100000000	/* allow empty path */
 #endif
 
 /* a horrid kludge trying to make sure that this will fail on old kernels */
-- 
2.47.3


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2026-05-18 10:47 UTC|newest]

Thread overview: 114+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-18 10:47 Mark Brown [this message]
2026-05-18 16:32 ` linux-next: build failure after merge of the vfs-brauner tree Mark Brown
2026-05-18 17:06   ` Dorjoy Chowdhury
2026-05-18 17:13     ` Mark Brown
2026-05-18 19:12       ` Jori Koolstra
2026-05-19 16:24         ` Mark Brown
2026-05-21 13:58           ` Jori Koolstra
2026-05-27 12:21             ` Christian Brauner
2026-05-27 13:09               ` Aleksa Sarai
2026-06-03 14:06                 ` Jori Koolstra
2026-06-03 14:13                   ` Aleksa Sarai
2026-06-03 14:30                     ` Jori Koolstra
2026-06-03 14:55                       ` Aleksa Sarai
  -- strict thread matches above, loose matches on Subject: below --
2026-04-09 12:25 Mark Brown
2026-03-25 12:32 Mark Brown
2026-03-26 13:36 ` Christian Brauner
2026-03-27 17:48   ` Mark Brown
2026-03-30 13:17     ` Mark Brown
2026-03-31  9:21       ` Christian Brauner
2026-04-01 10:55         ` Mark Brown
2026-03-13 13:00 Mark Brown
2026-03-23 13:56 ` Mark Brown
2026-03-23 15:37   ` Christian Brauner
2026-03-24 13:28     ` Mark Brown
2026-03-26 13:42       ` Christian Brauner
2026-01-27 11:45 Mark Brown
2026-02-02 14:58 ` Mark Brown
2026-02-04 14:31   ` Mark Brown
2026-02-06 12:19     ` Christian Brauner
2026-02-08 20:55       ` Mark Brown
2026-02-09  1:14         ` Al Viro
2026-01-19 14:30 Mark Brown
2026-01-20  6:55 ` kernel test robot
2026-01-20  8:39 ` kernel test robot
2025-11-16 21:43 Stephen Rothwell
2025-11-16 22:23 ` Jeff Layton
2025-11-17  2:16   ` Stephen Rothwell
2025-11-28  0:04     ` Stephen Rothwell
2025-11-28  9:53       ` Christian Brauner
2025-11-05 22:49 Stephen Rothwell
2025-11-28 10:09 ` Christian Brauner
2025-11-05  0:10 Stephen Rothwell
2025-10-30 21:35 Stephen Rothwell
2025-09-04  1:33 Stephen Rothwell
2025-09-04  7:44 ` schuster.simon
2025-09-08  2:02 ` Stephen Rothwell
2025-09-10  0:49   ` Stephen Rothwell
2025-09-11 12:13     ` Bagas Sanjaya
2025-09-15  6:35     ` schuster.simon
2025-09-15 14:11     ` Christian Brauner
2025-08-31 23:34 Stephen Rothwell
2025-09-01  4:44 ` Onur Özkan
2025-08-17 23:05 Stephen Rothwell
2025-08-19 23:42 ` Stephen Rothwell
2025-08-20 22:54   ` Stephen Rothwell
2025-08-20 23:16     ` Andrew Morton
2025-08-20 23:15 ` Stephen Rothwell
2025-06-18 23:45 Stephen Rothwell
2025-06-19  5:22 ` Lorenzo Stoakes
2025-05-21 10:49 Stephen Rothwell
2025-05-23 10:14 ` Christian Brauner
2025-03-17 23:12 Stephen Rothwell
2025-03-18 15:24 ` Mike Marshall
2025-03-18 15:37   ` Arnd Bergmann
2025-03-18 15:42     ` Mike Marshall
2025-03-17 12:56 Stephen Rothwell
2024-12-11 22:54 Stephen Rothwell
2024-09-02 23:27 Stephen Rothwell
2024-09-03  2:41 ` Aleksa Sarai
2024-09-05  0:58   ` Stephen Rothwell
2024-09-10  0:23     ` Stephen Rothwell
2024-09-10  8:50       ` Christian Brauner
2024-09-10 11:12         ` Stephen Rothwell
2024-09-12 10:23           ` Christian Brauner
2024-09-12 11:24             ` Stephen Rothwell
2024-09-10 14:26         ` Arnaldo Carvalho de Melo
2024-08-19 23:03 Stephen Rothwell
2024-08-06  0:57 Stephen Rothwell
2024-07-26  0:00 Stephen Rothwell
2024-07-29 23:00 ` Stephen Rothwell
2024-07-30 12:12   ` Christian Brauner
2024-06-27 14:08 Mark Brown
2024-04-04  2:24 Stephen Rothwell
2024-04-04  7:50 ` David Howells
2024-02-18 23:44 Stephen Rothwell
2024-03-12 23:41 ` Stephen Rothwell
2024-03-12 23:45   ` Chuck Lever III
2024-03-13  3:10     ` Stephen Rothwell
2024-02-11 23:52 Stephen Rothwell
2024-02-12  0:36 ` Kent Overstreet
2024-01-23  1:52 Stephen Rothwell
2024-01-24  1:20 ` Stephen Rothwell
2024-01-24 11:13   ` Christian Brauner
2024-01-24 11:35     ` Stephen Rothwell
2024-01-25 16:21       ` Christian Brauner
2023-12-21  0:18 Stephen Rothwell
2023-12-21  1:32 ` Matthew Wilcox
2023-12-21 23:41 ` Stephen Rothwell
2023-10-31  1:07 Stephen Rothwell
2023-10-18 23:54 Stephen Rothwell
2023-10-19  9:17 ` Christian Brauner
2023-10-02 22:30 Stephen Rothwell
2023-10-03 13:24 ` Christian Brauner
2023-09-28  0:54 Stephen Rothwell
2023-10-02 11:21 ` Jan Kara
2023-10-02 11:26   ` Jan Kara
2023-10-02 21:24     ` Stephen Rothwell
2023-10-03 13:27   ` Kent Overstreet
2023-10-04 15:46     ` Jan Kara
2023-10-09 14:00       ` Christian Brauner
2023-09-28  0:39 Stephen Rothwell
2023-09-28 14:52 ` Christian Brauner
2023-08-03  0:03 Stephen Rothwell
2023-08-03 10:06 ` Jan Kara

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=agruPPybCx8q2XcJ@sirena.org.uk \
    --to=broonie@kernel$(echo .)org \
    --cc=aleksa@amutable$(echo .)com \
    --cc=brauner@kernel$(echo .)org \
    --cc=dorjoychy111@gmail$(echo .)com \
    --cc=jkoolstra@xs4all$(echo .)nl \
    --cc=jlayton@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox