On Tue, Apr 08, 2025 at 02:34:37PM +0500, Mikhail Gavrilov wrote: > On Tue, Apr 8, 2025 at 2:18 PM Christian Brauner <brauner@xxxxxxxxxx> wrote: > > I'm confused why that's an issue: > > > > > git reset --hard 474f7825d5335798742b92f067e1d22365013107 > > HEAD is now at 474f7825d533 fs: add copy_mount_setattr() helper > > > > > git revert --no-edit 474f7825d5335798742b92f067e1d22365013107 > > [work.bisect e5673958d85c] Revert "fs: add copy_mount_setattr() helper" > > Date: Tue Apr 8 11:14:31 2025 +0200 > > 1 file changed, 33 insertions(+), 40 deletions(-) > > > git reset --hard v6.15-rc1 > HEAD is now at 0af2f6be1b42 Linux 6.15-rc1 > > git revert -n 474f7825d5335798742b92f067e1d22365013107 > Auto-merging fs/namespace.c > CONFLICT (content): Merge conflict in fs/namespace.c > error: could not revert 474f7825d533... fs: add copy_mount_setattr() helper > hint: after resolving the conflicts, mark the corrected paths > hint: with 'git add <paths>' or 'git rm <paths>' > hint: Disable this message with "git config set advice.mergeConflict false" Resolved it for you: https://web.git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git/log/?h=work.bisect
