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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230124110745.5c9b78b0@oak.ozlabs.ibm.com>
Date:   Tue, 24 Jan 2023 11:07:45 +1100
From:   Stephen Rothwell <sfr@...hwell.id.au>
To:     Damien Le Moal <damien.lemoal@...nsource.wdc.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Damien Le Moal <Damien.LeMoal@....com>,
        Christian Brauner <christian@...uner.io>,
        Seth Forshee <sforshee@...nel.org>,
        Christian Brauner <brauner@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the zonefs tree with the
 vfs-idmapping tree

Hi Damien,

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

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped