linux-kernel - Re: linux-next: manual merge of the tip tree with the pm 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: <20240717094907.GAZpeTk403VSYORXOH@fat_crate.local>
Date: Wed, 17 Jul 2024 11:49:07 +0200
From: Borislav Petkov <bp@...en8.de>
To: srinivas pandruvada <srinivas.pandruvada@...ux.intel.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Mario Limonciello <mario.limonciello@....com>,
	Perry Yuan <perry.yuan@....com>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
	Xiaojian Du <Xiaojian.Du@....com>
Subject: Re: linux-next: manual merge of the tip tree with the pm tree

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