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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20251128-semester-ausnimmt-1261dfc6153b@brauner>
Date: Fri, 28 Nov 2025 11:09:16 +0100
From: Christian Brauner <brauner@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the vfs-brauner tree

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.