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

[Christian Brauner]

On Thu, Nov 06, 2025 at 09:49:51AM +1100, Stephen Rothwell wrote:
> 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.

Hm, it gets tested ofc I'll take a look at the infra to figure out why
it got pushed after a build failure.