IronPort-SDR: Hv9UMDcwUmUBxK/q74XzQ75qkGMpDct0T4BoZIGfI/6ZSgXAlvrRtl6hN6cjqpbbiKz3NhKdCp
 72+Actt4BtASNiV5IaLO8hy03uzC3aD0JuQll77GSpUO0ODke//Sc1fnrRWxCGxuZ6HR9MJYdE
 XTGan+pbYvmvsMftxyfT5dNTVgbTVvXfqgGxqgx5v1QehHSYU7uS1eh30RoO/5Onx30BxgVeaQ
 2WrsQXkSTEHVvcpay8k9JmQX+XkLQRutNNXtvpl8UY0k7Q90sC+Ya/OqL2XQNM4DZ45BD0fEsr
 GTI=
IronPort-SDR: 7q8Xz5OmvtaqdwMZ9PHLAuU9OAtFqBtUo4pZXq00Q8a9dxbX3RodRZnUGtoGlpVsixh709OweN
 3WsQStChopJYkvF9o3c7QWnza9YgcpImizUDeiYmAPhc3LVyUeL96a8e2FqkMUFbIRBM/SMU4I
 hRkcoOvTUB9wYTt9bcS1t14kbkdjV1XQYMfoPjf5qOQIGILoS87FUXIQUbc3eV5e/KIp01sd75
 2Euk1CxMRUIW/EWoU5qLZvJ9O375U1aR8Bg21hW9PQEGXM1ytKF7n/0yqhjnf6wwO/diene4Bt
 FoI=
WDCIronportException: Internal
Message-ID: <8871d62a-b87f-75d6-fb5d-d9811a3e5dae@opensource.wdc.com>
Date:   Tue, 24 Jan 2023 09:11:47 +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@rothwell.id.au>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        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>
 <87958074-baa4-b6c9-da0c-d654e4009611@opensource.wdc.com>
 <20230124110745.5c9b78b0@oak.ozlabs.ibm.com>
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital Research
In-Reply-To: <20230124110745.5c9b78b0@oak.ozlabs.ibm.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 1/24/23 09:07, Stephen Rothwell wrote:
> Hi Damien,
> 
> On Tue, 24 Jan 2023 08:30:29 +0900 Damien Le Moal <damien.lemoal@opensource.wdc.com> wrote:
>>
>> 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 :)
> 
> When I said "merge", I meant literally "git merge <some stable branch
> from the vfs-mapping tree that contains the conflicting commit>" not
> cherry pick the commits i.e. you would need to coordinate with
> Christian about having a common branch (or making sure that the part of
> his tree you pull in is immutable).

Yep, cherry picking did not work :)
I did a merge test and came up with the same resolution as you did. It
looks good. It looks big but is in fact fairly simple. I will keep it as
is and signal it to Linus when I send my PR.

But retesting everything to be sure there are no issues.

Christian,

Next time, when you touch an fs, please cc the maintainer for acks. I had
that zonefs series ready for a while and we could have coordinated for the
conflict...

-- 
Damien Le Moal
Western Digital Research