linux-kernel - linux-next: duplicate patch in the nolibc 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-next>] [day] [month] [year] [list]

Message-ID: <20230817133811.0a73c624@canb.auug.org.au>
Date:   Thu, 17 Aug 2023 13:38:11 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Shuah Khan <skhan@...uxfoundation.org>, Willy Tarreau <w@....eu>,
        Thomas Weißschuh <thomas@...ch.de>,
        "Paul E. McKenney" <paulmck@...nel.org>,
        Christian Brauner <brauner@...nel.org>
Cc:     Thomas Weißschuh <linux@...ssschuh.net>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: duplicate patch in the nolibc tree

Hi all,

The following commit is also in the vfs-brauner tree as a different commit
(but the same patch):

  ba859b2e419c ("selftests/nolibc: drop test chmod_net")

This is commit

  49319832de90 ("selftests/nolibc: drop test chmod_net")

in the vfs-brauner tree.

This duplication is causing a conflict.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped