linux-kernel - Re: linux-next: manual merge of the mtd tree with the mtd-fixes 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 for Android: free password hash cracker in your pocket

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

Date:   Thu, 20 Oct 2022 01:06:47 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miquel Raynal <miquel.raynal@...tlin.com>
Cc:     Rafał Miłecki <rafal@...ecki.pl>,
        Richard Weinberger <richard.weinberger@...il.com>,
        Boris Brezillon <boris.brezillon@...labora.com>,
        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 mtd tree with the mtd-fixes
 tree

Hi Miquel,

On Wed, 19 Oct 2022 15:49:07 +0200 Miquel Raynal <miquel.raynal@...tlin.com> wrote:
>
> Thanks Rafał for the right resolution and Stephen for carrying the fix.
> I'll send the fixes PR soon and rebase on top of an -rc containing it
> to avoid this conflict resolution to be needed when sending the final
> PR to Linus during the next MW.

Why not just merge your mtd/fixes branch into your mtd/branch (rather
than rebasing)?

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped