public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
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 22:19:00 +0200	[thread overview]
Message-ID: <20230822-mitbringen-unwillig-176fd9e8873b@brauner> (raw)
In-Reply-To: <20230822182604.GB11286@frogsfrogsfrogs>

> > my preferred solution. How do you feel about that?
> 
> I'm happy to have you pull my xfs-linux tags into your vfs tree. :)

Ah, sweet. I apppreciate that. I'll mention in the pr to Linus that if
he wants to reject other parts of the super work that he should then
still simply pull the freeze stuff from you without the rest.

> 
> Here's a tag with just the two vfs patches:
> https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git/tag/?h=vfs-6.6-merge-2
> 
> This second tag builds on that, by adding the first actual user of
> FREEZE_HOLDER_KERNEL:
> https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git/tag/?h=vfs-6.6-merge-3

Assuming I understood correctly I did just pull both tags and pushed
them out. Would you please take a look at
https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git/log/?h=vfs.super
and let me know if everything looks as expected? I'll be going afk in a
bit just waiting for the kernel build to finish to kick of some
xfstests. If you find anything I'll fix up any issues up tomorrow
morning.

> 
> There will be more for 6.7(+?) if Luis manages to get back to his
> auto-fsfreeze during suspend, or if Shiyang finishes the series to
> handle pmem media error reporting in xfs.

Ok, sounds good let me know/Cc me when ready/needed.

Thanks for all the help!

  reply	other threads:[~2023-08-22 20:19 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
2023-08-22 18:26     ` Darrick J. Wong
2023-08-22 20:19       ` Christian Brauner [this message]
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-mitbringen-unwillig-176fd9e8873b@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