From: Christian Brauner <brauner@kernel.org>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the djw-vfs tree
Date: Tue, 22 Aug 2023 11:46:38 +0200 [thread overview]
Message-ID: <20230822-turnus-quert-9b11d4e30dc9@brauner> (raw)
In-Reply-To: <20230822025120.GA11286@frogsfrogsfrogs>
> Christian: I've been planning to merge the {freeze,thaw}_super @who
> changes for 6.6; do you think more 'cooperating with the maintainer' is
> needed, or shall I simply push my branch to Linus with a note that
> s/down_write/super_lock_excl/ s/up_write/super_unlock_excl is needed to
> resolve the merge the conflict?
Hm, that's not a pleasant merge conflict given that it's locking
changes. It would probably be fine to just bring it up the way it is but
it looks needlessly messy/uncoordinated. I'm wonder why this isn't just
all in vfs.super since it's core vfs infra change anyway. Maybe I just
missed the patches if so then sorry about that.
That's the two infrastructure patches in the kernel-fsfreeze
branch/kernel-fsfreeze_2023-07-27 tag?:
ad0164493b81 ("fs: distinguish between user initiated freeze and kernel initiated freeze")
53f65fd7a3d5 ("fs: wait for partially frozen filesystemskernel-fsfreeze_2023-07-27kernel-fsfreeze")
If you give me a tag with your description and just the two commits or I
just cherry pick them and cite your description in my pr that would be
my preferred solution. How do you feel about that?
next prev parent reply other threads:[~2023-08-22 9:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-22 1:05 linux-next: manual merge of the vfs-brauner tree with the djw-vfs tree Stephen Rothwell
2023-08-22 2:51 ` Darrick J. Wong
2023-08-22 9:46 ` Christian Brauner [this message]
2023-08-22 18:26 ` Darrick J. Wong
2023-08-22 20:19 ` Christian Brauner
2023-08-22 21:14 ` Darrick J. Wong
2023-08-23 7:44 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230822-turnus-quert-9b11d4e30dc9@brauner \
--to=brauner@kernel.org \
--cc=djwong@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox