From patchwork Wed Dec 18 00:51:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13912854 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5088EE77184 for ; Wed, 18 Dec 2024 00:51:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6DC310E078; Wed, 18 Dec 2024 00:51:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="QjmBqDwF"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id B628010E078; Wed, 18 Dec 2024 00:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1734483090; bh=1vpT2P+faVorP8ST2y/5c7i1Ua3G3TaAidqfaRre4Ks=; h=Date:From:To:Cc:Subject:From; b=QjmBqDwFF8r7Z4o9kxOEh+ttBKAyRMdPlDY/5kx4vLw2G7jff/5X/61j5tB3XKUDf OOSj10SxWK7CUWysSfYEaTCXv3gjCnZyCOcwUSAiq5NB9YKRbr76dcFZoP90ru3j3L bppiRjWGWk0cPnK1J3sNHfUSseycS72Q6X+Ti/2AN6zy5alt6QxFsmLwx+MkGyDyaG 403gmq4x7c7SUcuHfUQitPe6PFbfr1HJ1QuF60md+LzS2zyC8KCRzwGBVMi4PSY9pQ 4zA8QUXcfR9UkDRlr0Q+UvBnXtXo50ZBueoIX81LolLaPh6MnVvsFCEgCsZzyB+/ct L075q1NuFWKgw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4YCZr105Hdz4wcw; Wed, 18 Dec 2024 11:51:28 +1100 (AEDT) Date: Wed, 18 Dec 2024 11:51:32 +1100 From: Stephen Rothwell To: Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , Imre Deak , Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm-intel tree with the drm-misc tree Message-ID: <20241218115132.6e15b328@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" [Thanks, Imre for the heads up and help with the conflict resolution] Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp_mst.c between commit: 6fe7b1d10cbd ("drm/i915/dp_mst: Expose a connector to kernel users after it's properly initialized") from the drm-misc tree and commits: 529798bd786a ("drm/i915/mst: convert to struct intel_display") d58f65df2dcb ("drm/i915/dp_mst: Fix connector initialization in intel_dp_add_mst_connector()") fdb65ede8a45 ("drm/i915/mst: unify MST connector function naming to mst_connector_*") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c index 56ca571e534c,326ff20a5a49..000000000000 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c