From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Damien Le Moal <damien.lemoal@opensource•wdc.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc•com>,
Christian Brauner <christian@brauner•io>,
Seth Forshee <sforshee@kernel•org>,
Christian Brauner <brauner@kernel•org>,
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 zonefs tree with the vfs-idmapping tree
Date: Tue, 24 Jan 2023 10:25:35 +1100 [thread overview]
Message-ID: <20230124102535.1e21a533@canb.auug.org.au> (raw)
In-Reply-To: <1631b427-9efd-cd26-5dbc-0143097f859b@opensource.wdc.com>
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
Hi Damien,
On Tue, 24 Jan 2023 07:31:18 +0900 Damien Le Moal <damien.lemoal@opensource•wdc.com> wrote:
>
> Thanks for that. Do you want me to rebase my for-6.3/for-next branch on
> these patches ? I need to retest everything anyway, so I might as well do
> that.
You can only rebase on top of the vfs-idmapping tree if you get a
guarantee that it is immutable. In any case, it may be better to merge
(an immutable subset) of the vfs-idmapping tree (and fix up the
conflicts) rather than rebasing on top of it.
Alternatively, just leave the fix up to Linus (but mention it to him
when you send your pull requests).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-01-23 23:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 21:59 linux-next: manual merge of the zonefs tree with the vfs-idmapping tree Stephen Rothwell
2023-01-23 22:31 ` Damien Le Moal
2023-01-23 23:25 ` Stephen Rothwell [this message]
2023-01-23 23:30 ` Damien Le Moal
2023-01-24 0:07 ` Stephen Rothwell
2023-01-24 0:11 ` Damien Le Moal
2023-01-24 8:32 ` Christian Brauner
2023-01-24 8:41 ` Damien Le Moal
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=20230124102535.1e21a533@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Damien.LeMoal@wdc$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=christian@brauner$(echo .)io \
--cc=damien.lemoal@opensource$(echo .)wdc.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sforshee@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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