linux-kernel - Re: linux-next: duplicate patches in the vfs-brauner 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] [day] [month] [year] [list]

Message-ID: <1583609.1703155848@warthog.procyon.org.uk>
Date: Thu, 21 Dec 2023 10:50:48 +0000
From: David Howells <dhowells@...hat.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: dhowells@...hat.com, 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: duplicate patches in the vfs-brauner tree

Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> It looks like the afs tree has been rebased since (part of) it was merged
> into the vfs-brauner tree. :-(

What's the best way to deal with this?  Push these two patches down to the
bottom of the branches and then base both trees off those two same commits?

David