Merge tag 'bootconfig-fixes-v7.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

ca3e3459 · Linus Torvalds <[email protected]> · 2026-10-13 16:53:40 -07:00

Pull bootconfig fix from Masami Hiramatsu:

 - bootconfig: give the footer size static_assert a message

   Add a message to static_assert() macro because it is required for
   the compiler before C23. This fixes a warning.

* tag 'bootconfig-fixes-v7.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  bootconfig: give the footer size static_assert a message

Commit: ca3e345926b00bd59106c1bf2022b1daf4164a67
Parents: cbc08c20 · a1ddc272

Merge commit. Changes below are compared with the first parent: cbc08c20.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
tools/bootconfig/main.c	modified	+2	−1	View file

tools/bootconfig/main.c

View file

diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
index 17d971d..df05340 100644
--- a/tools/bootconfig/main.c
+++ b/tools/bootconfig/main.c
@@ -495,7 +495,8 @@ static int apply_xbc(const char *path, const char *xbc_path)
 	footer.size = htole32(size);
 	footer.csum = htole32(csum);
 	memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
-	static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE);
+	static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE,
+		      "bootconfig footer size mismatch");
 	memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE);
 
 	total_size = size + BOOTCONFIG_FOOTER_SIZE;