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 470C9279906; Wed, 23 Apr 2025 15:28:50 +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=1745422131; cv=none; b=Vc3SqtiDo2iKnI4THWyhJLwtkirM1LWbcppalo2sa4ZXesWGvtl1jWsSvb0YxNVEGuGwpo2tkbXiol0BaNy0+nmm7tvXDBffPLdeg1ACg3qJQLqVVB3jaVwjP5mlIKgHp0sxC2mfFKVgKAtY+0q96TnRpWbFe9SynoD0sNdF7No= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745422131; c=relaxed/simple; bh=SVbWkhcbnOKIGR/RCMItJDWvmz0RnfPLzBwO6X2DhSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EDK6jfs0rFLtv2JVhBXcXCdj17FFO0zFKpIasrGNHkbaN6cUMc+9G4OjcW+9zq2tzW96Z5/tif+9tLVOrGKFQPRvsTdb/x0c489iIob7JUqjo4oZjh3zcXCP/6V80wLYaclSbcBhGmO2Gr2BlYQ1mTxeQ2wnjcNJE+SgD579nUw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vacl8u09; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Vacl8u09" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75336C4CEE2; Wed, 23 Apr 2025 15:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745422130; bh=SVbWkhcbnOKIGR/RCMItJDWvmz0RnfPLzBwO6X2DhSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vacl8u09ATrEONWWernQhb7HPp7TVDgheEuCXmp7Fg/hxgO/r/EP85RXVtyWPMucT AoQvSmOqwbHvdUJrzCK6wUa9rMJtXCpaaeKGs6ivEqNCIG5UC8hs3erfuvjGrW+ETc sQHRbO1ysoqwGfins5xyOzbRxe9dZEDAV6Y/LVn8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Rolf Eike Beer , Dmitry Baryshkov , Raphael Gallais-Pou Subject: [PATCH 6.1 242/291] drm/sti: remove duplicate object names Date: Wed, 23 Apr 2025 16:43:51 +0200 Message-ID: <20250423142634.308079982@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142624.409452181@linuxfoundation.org> References: <20250423142624.409452181@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rolf Eike Beer commit 7fb6afa9125fc111478615e24231943c4f76cc2e upstream. When merging 2 drivers common object files were not deduplicated. Fixes: dcec16efd677 ("drm/sti: Build monolithic driver") Cc: stable@kernel.org Signed-off-by: Rolf Eike Beer Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/1920148.tdWV9SEqCh@devpool47.emlix.com Signed-off-by: Raphael Gallais-Pou Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/sti/Makefile | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/gpu/drm/sti/Makefile +++ b/drivers/gpu/drm/sti/Makefile @@ -7,8 +7,6 @@ sti-drm-y := \ sti_compositor.o \ sti_crtc.o \ sti_plane.o \ - sti_crtc.o \ - sti_plane.o \ sti_hdmi.o \ sti_hdmi_tx3g4c28phy.o \ sti_dvo.o \