linux-kernel - Re: linux-next: manual merge of the kunit-next tree with the kunit-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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20211020092023.0a9a43f4@elm.ozlabs.ibm.com>
Date:   Wed, 20 Oct 2021 09:20:23 +1100
From:   Stephen Rothwell <sfr@...hwell.id.au>
To:     Shuah Khan <skhan@...uxfoundation.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Daniel Latypov <dlatypov@...gle.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Brendan Higgins <brendanhiggins@...gle.com>
Subject: Re: linux-next: manual merge of the kunit-next tree with the
 kunit-fixes tree

Hi Shuah,

On Tue, 19 Oct 2021 15:26:40 -0600 Shuah Khan <skhan@...uxfoundation.org> wrote:
>
> I fixed the merge conflict in kunit-next tree after rebase to Linux 5.15-rc6.
> There is no need to carry this fix.
> 
> Daniel! Please review to see if it looks good. It was very minor fix-up.

There was really no need to rebase.  A simple merge of the kunit-fixes
tree into the kunit-next tree would has sufficed, maintained history
and allowed a place for an explanation.  Or you could have mentioned
the conflict to Linus during the merge window.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped