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: <87958074-baa4-b6c9-da0c-d654e4009611@opensource.wdc.com>
Date:   Tue, 24 Jan 2023 08:30:29 +0900
From:   Damien Le Moal <damien.lemoal@...nsource.wdc.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     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

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@...nsource.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