Re: linux-next: manual merge of the tip tree with the pm tree

[Borislav Petkov]

On Tue, Jul 16, 2024 at 07:33:12PM -0700, srinivas pandruvada wrote:
> linux-next branch of linux-pm tree needs to be rebased to Linus's tree.

Why?

You resolve the merge conflict and show Linus the resolution when sending the
pull request.

Rebasing is a no-no.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette