linux-kernel - Re: linux-next: manual merge of the kselftest tree with the mm-hotfixes 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: <038eb23d-f74f-43c6-91e8-762e6bbc7282@sirena.org.uk>
Date:   Thu, 19 Oct 2023 16:36:07 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Shuah Khan <skhan@...uxfoundation.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Shuah Khan <shuah@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tiezhu Yang <yangtiezhu@...ngson.cn>
Subject: Re: linux-next: manual merge of the kselftest tree with the
 mm-hotfixes tree

On Thu, Oct 19, 2023 at 08:49:24AM -0600, Shuah Khan wrote:
> On 10/18/23 23:33, Stephen Rothwell wrote:

> > I fixed it up (I used this files form the latter commit) and can carry the
> > fix as necessary. This is now fixed as far as linux-next is concerned,
> > but any non trivial conflicts should be mentioned to your upstream
> > maintainer when your tree is submitted for merging.  You may also want
> > to consider cooperating with the maintainer of the conflicting tree to
> > minimise any particularly complex conflicts.

That'll drop the fix that Tiezhu did which is a good one.

> I can rebase linux-kselftest next to pick up the following once it goes
> into Linus's tree.

I've got the rebase/rework locally (I did it as a new commit which isn't
ideal but it's such a complete conflict that it felt like the best
option).  Assuming nothing blows up in my local CI I should send it out
later today.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)