IronPort-SDR: 3LQFxRub2mdYa9mPbgiPS/4AnZdhfCs2/93WhbPYQZFdxiFaDqotnT+8eD/rGwK1G4fOnKgpn7
 Z3z7Ha2PF04ZKJABPVAo0UKhFluqnp+XqLvCklfBvCSbLhHjm1yrawKXFDaqAVaiZ0ZHWZ2OT8
 89KxLuf8hUuTxm5GvarfS0Yu/C+Yepem7mek/LaWMdl0meOSyWLSD8XLKcTMGIcXQIlV2+KAiu
 iPrAlQm/X1gFclYW0nmkIw5R3CzmJSQVrpovkOCAmcLjWxVAhU8C6ZHpJbwUJv6ijQkvyW/3uG
 HVU=
IronPort-SDR: a1dkJQ4d/zpUA7fgJHws9szDK2GdpyyEkXiLKXwNJ8AHuYmFNTmjbeA5bBgqaTw2Pcu0b9hR+s
 XYl7hJKkhjN2RxyeZWg1vHVpGGtHxHwV39SsNXZobg00Bac2Q9yS1zn9i7iyspCkeLEc/Ggdjx
 cUBjdtijz5+B3T+hYkTUH/sdiz+JyH3+nHp3aGVVwS8Qmm3S99MWjV4/qUquAzX+zCSJ5YDx/4
 xkjKAQvPz+urSGXhg6oWYe0aooXstyjW21N21R7IU09YeTrZy8jXS74bYBtp3Oju5Bk+3gcHpd
 PVw=
WDCIronportException: Internal
Message-ID: <87958074-baa4-b6c9-da0c-d654e4009611@opensource.wdc.com>
Date:   Tue, 24 Jan 2023 08:30:29 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Subject: Re: linux-next: manual merge of the zonefs tree with the
 vfs-idmapping tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>
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>
References: <20230124085951.59eb8da3@canb.auug.org.au>
 <1631b427-9efd-cd26-5dbc-0143097f859b@opensource.wdc.com>
 <20230124102535.1e21a533@canb.auug.org.au>
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital Research
In-Reply-To: <20230124102535.1e21a533@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 1/24/23 08:25, Stephen Rothwell wrote:
> 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.

OK. I think I will merge the 3 patches that create the conflict and rebase
the patches. I need that for retesting at least. But given the size of the
conflict resolution, I may push that as an update to my for-6.3/for-next
branch. Let me see...

> Alternatively, just leave the fix up to Linus (but mention it to him
> when you send your pull requests).

Understood. Let me retest first :)

Thanks !

-- 
Damien Le Moal
Western Digital Research