Subject: linux-next: build failure after merge of the vfs-brauner tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 6 Nov 2025 09:49:51 +1100

Hi all,

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

In file included from include/linux/compat.h:17,
                 from arch/powerpc/kernel/asm-offsets.c:13:
include/linux/fs.h:1431:1: error: version control conflict marker in file
 1431 | <<<<<<< HEAD
      | ^~~~~~~

and it went downhill from there :-(

Caused by commit

  3fef0b63fe1c ("Merge branch 'vfs-6.19.fs_header' into vfs.all")

Please, the order is merge stuff, test, publish ... :-(

I refetched the vfs-brauner tree (which has been updated) and tried again.

-- 
Cheers,
Stephen Rothwell