Subject: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 20 Oct 2021 09:20:23 +1100

Hi Shuah,

On Tue, 19 Oct 2021 15:26:40 -0600 Shuah Khan <[email-masked]> 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