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] [thread-next>] [day] [month] [year] [list]

Message-Id: <09c18763-7a60-4eea-b77b-85260b8b6b02@app.fastmail.com>
Date: Tue, 18 Mar 2025 16:37:18 +0100
From: "Arnd Bergmann" <arnd@...db.de>
To: "Mike Marshall" <hubcap@...ibond.com>,
 "Stephen Rothwell" <sfr@...b.auug.org.au>
Cc: "Christian Brauner" <brauner@...nel.org>,
 "Matthew Wilcox" <willy@...radead.org>,
 "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
 linux-next <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the vfs-brauner tree

On Tue, Mar 18, 2025, at 16:24, Mike Marshall wrote:
> Hi Stephen... is there something I should do differently? I might be
> using an older
> version of the patch, it was sent to me around three weeks ago.
>
>>>Caused by commit
>  >> 50fb0a7f43c0 ("orangefs: Move s_kmod_keyword_mask_map to
> orangefs-debugfs.c")
>>>merging badly with commit
>  >> 063f8013373a ("orangefs: move s_kmod_keyword_mask_map[] into debugfs.c")
>
> One has "Move" the one I'm using has "move", as if the author (Arnd)
> made an update
> to the patch and maybe I missed it...?

The earlier patch was from Matthew Wilcox. Our two patches are
almost identical (they add the same data in different parts of the
file) but sent independently, and the problem was that both got
applied instead of just one. I think the easiest fix would be
if you just drop my patch from your tree.

     Arnd