On Tue, Oct 01, 2024 at 10:38:22AM -0600, Marc Aurèle La France wrote: > On Tue, 2024-Oct-01, Marc Aurèle La France wrote: > > On Tue, 2024-Oct-01, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > The patch below does not apply to the 6.10-stable tree. > > > If someone wants it applied there, or to any other stable or longterm > > > tree, then please email the backport, including the original git commit > > > id to <stable@xxxxxxxxxxxxxxx>. > > > > To reproduce the conflict and resubmit, you may use the following commands: > > > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ > > > linux-6.10.y > > > git checkout FETCH_HEAD > > > git cherry-pick -x 3a987b88a42593875f6345188ca33731c7df728c > > > # <resolve conflicts, build, test, etc.> > > > git commit -s > > > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to > > > '2024100128-prison-ploy-dfd6@gregkh' --subject-prefix 'PATCH 6.10.y' > > > HEAD^.. > > > > Possible dependencies: > > > > 3a987b88a425 ("debugfs show actual source in /proc/mounts") > > > 49abee5991e1 ("debugfs: Convert to new uid/gid option parsing helpers") > > > > thanks, > > > > greg k-h > > > > ------------------ original commit in Linus's tree ------------------ > > > > From 3a987b88a42593875f6345188ca33731c7df728c Mon Sep 17 00:00:00 2001 > > > From: =?UTF-8?q?Marc=20Aur=C3=A8le=20La=20France?= <tsi@xxxxxxxxxx> > > > Date: Sat, 10 Aug 2024 13:25:27 -0600 > > > Subject: [PATCH] debugfs show actual source in /proc/mounts > > > MIME-Version: 1.0 > > > Content-Type: text/plain; charset=UTF-8 > > > Content-Transfer-Encoding: 8bit > > > > After its conversion to the new mount API, debugfs displays "none" in > > > /proc/mounts instead of the actual source. Fix this by recognising its > > > "source" mount option. > > > > Signed-off-by: Marc Aurèle La France <tsi@xxxxxxxxxx> > > > Link: > > > https://lore.kernel.org/r/e439fae2-01da-234b-75b9-2a7951671e27@xxxxxxxxxx > > > Fixes: a20971c18752 ("vfs: Convert debugfs to use the new mount API") > > > Cc: stable@xxxxxxxxxxxxxxx # 6.10.x: 49abee5991e1: debugfs: Convert to new > > > uid/gid option parsing helpers > > > Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx> > > > ... elided. > > > This is because the commit message should have instead read ... > > > After commit 0c07c273a5fe ("debugfs: continue to ignore unknown mount > > options"), debugfs displays "none" in /proc/mounts instead of the actual > > source. Fix this by recognising its "source" mount option. > > > Signed-off-by: Marc Aurèle La France <tsi@xxxxxxxxxx> > > Fixes: 0c07c273a5fe ("debugfs: continue to ignore unknown mount options") > > Cc: stable@xxxxxxxxxxxxxxx # 6.10.x: 9f111059e725: fs_parse: add uid & gid > > option option parsing helpers > > Cc: stable@xxxxxxxxxxxxxxx # 6.10.x: 49abee5991e1: debugfs: Convert to new > > uid/gid option parsing helpers > > > ... along with ... > > > Link: > > https://lore.kernel.org/r/e439fae2-01da-234b-75b9-2a7951671e27@xxxxxxxxxx > > Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx> > > Oops. That link should be ... > > Link: https://lore.kernel.org/all/883a7548-9e67-ccf6-23b7-c4e37934f840@xxxxxxxxxx Thanks, looks like Sasha picked these up now. greg k-h
