Re: linux-next: manual merge of the zonefs tree with the vfs-idmapping tree

[Stephen Rothwell]

Hi Damien,

On Tue, 24 Jan 2023 08:30:29 +0900 Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx> 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).

-- 
Cheers,
Stephen Rothwell

Attachment: pgp9y0zwRmYx8.pgp
Description: OpenPGP digital signature