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@xxxxxxxxxxxxxxxxxx> 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
