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: <20230124102535.1e21a533@canb.auug.org.au>
Date:   Tue, 24 Jan 2023 10:25:35 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Damien Le Moal <damien.lemoal@...nsource.wdc.com>
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

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.

Alternatively, just leave the fix up to Linus (but mention it to him
when you send your pull requests).
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped