linux-kernel - linux-next: manual merge of the vfs-brauner tree with the ext3 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>] [day] [month] [year] [list]

Message-ID: <aNEKzrMMxLAVHGIn@finisterre.sirena.org.uk>
Date: Mon, 22 Sep 2025 09:37:34 +0100
From: Mark Brown <broonie@...nel.org>
To: Christian Brauner <brauner@...nel.org>
Cc: Jan Kara <jack@...e.cz>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Marco Crivellari <marco.crivellari@...e.com>,
	Shashank A P <shashank.ap@...sung.com>
Subject: linux-next: manual merge of the vfs-brauner tree with the ext3 tree

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/quota/dquot.c

between commit:

  72b7ceca857f3 ("fs: quota: create dedicated workqueue for quota_release_work")

from the ext3 tree and commit:

  08621f25a2687 ("fs: replace use of system_unbound_wq with system_dfl_wq")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/quota/dquot.c
index 6c4a6ee1fa2b6,afa15a2145382..0000000000000
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c

(ext3 version)

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)