From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 053C21E507; Tue, 29 Oct 2024 14:20:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730211645; cv=none; b=NfGc0RRG2Ry6ohlltEJiR62ELBAebTBWGUKsVm7YXnxVKoDh/i7IkMF/28TrCLjnQCMfWpjCq5HQs8TIEtrUdEXhDDwXpZ4GJiiCru0p4J4GZR7RI2enEU8wCMv/3lt1N5FAlRbX4iV7Mk1LAQUHbUBU1BMvrMZL3Z/anzbTFWE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730211645; c=relaxed/simple; bh=Ncqu84eUIoV/noeY6jmyqqV/eVZFpGTtgpv7Q0T0B5g=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=h1ZdEfdh3DUSxNU4Ie30UT9N4iAgdVED3KJe0QPnTkXfKeDdOqNzJyrLfk3IpuywPplu1yHtYHDsGh+qi6tjSmgABjQfv9TR8k+gj2uuvONteOimc11BB8UGWBJsGYclf+ceKRajCRZ3lZ65hms7S7qIgV33lrmX60oUMVm2X0A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NYjzEArB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NYjzEArB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D36FC4CECD; Tue, 29 Oct 2024 14:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730211643; bh=Ncqu84eUIoV/noeY6jmyqqV/eVZFpGTtgpv7Q0T0B5g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NYjzEArBIeXR63S0DAJiAxxbzhzEZIV8QivhpU5ANCtLSGwqTZ1nm45/4qn6niL0d m9uEuR081kn8tzG0jdN0ZyFKyOLtRKWMAcjyVMeRMAVgogWoSvIM/r+TUy/LkyouX1 fnMShynZ9vA6BpE5TTeut1rS7u2olD5uvk+oYxlkBVuHcsA3sZ8bLTVD2eK3TohywQ jIpt1n3IOm8zAcejWENEaSB7/D/zbPV58HCiosAAaWDTXM6KSX4LOcuCNgSb0Lzi66 3YYhrwc+gBGc4Bth8M2VRrK+KOjqYs+cJbO5+C2Be+/v/rYlI6pec3N7anHClUdtQB blwO7HzGIiEXw== Date: Tue, 29 Oct 2024 10:20:41 -0400 From: Sasha Levin To: Fedor Pchelkin Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Deucher , Harry Wentland , Leo Li , Rodrigo Siqueira , Christian =?iso-8859-1?Q?K=F6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Fangzhi Zuo , Wayne Lin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org, Alexey Khoroshilov , Mario Limonciello , Jonathan Gray Subject: Re: [PATCH 0/1] On DRM -> stable process Message-ID: References: <20241029133141.45335-1-pchelkin@ispras.ru> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20241029133141.45335-1-pchelkin@ispras.ru> On Tue, Oct 29, 2024 at 04:31:40PM +0300, Fedor Pchelkin wrote: >BTW, a question to the stable-team: what Git magic (3-way-merge?) let the >duplicate patch be applied successfully? The patch context in stable trees >was different to that moment so should the duplicate have been expected to >fail to be applied? Just plain git... Try it yourself :) $ git checkout 282f0a482ee6 HEAD is now at 282f0a482ee61 drm/amd/display: Skip Recompute DSC Params if no Stream on Link $ git cherry-pick 7c887efda1 Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c [detached HEAD 2a1c937960abd] drm/amd/display: Skip Recompute DSC Params if no Stream on Link Author: Fangzhi Zuo Date: Fri Jul 12 16:30:03 2024 -0400 1 file changed, 3 insertions(+) $ git log -2 --oneline 2a1c937960abd (HEAD) drm/amd/display: Skip Recompute DSC Params if no Stream on Link 282f0a482ee61 drm/amd/display: Skip Recompute DSC Params if no Stream on Link -- Thanks, Sasha