From patchwork Tue Jan 9 00:22:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13514204 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 7A925C4707B for ; Tue, 9 Jan 2024 00:23:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A1EF510E345; Tue, 9 Jan 2024 00:23:01 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id C16E510E345; Tue, 9 Jan 2024 00:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704759778; bh=UtD5+zFpbHH54Dk7I6pNkcSPwd78+kcXsfGz/v1610Y=; h=Date:From:To:Cc:Subject:From; b=c/m8U+QrcYOeM7GEMXjqCemYRferAtFYm52YUD8hLa56m7nwVs/t0LUQrx8+SLO/I 4/P16UIjmKDPZuJiuKc0SPQ26MD0gVEluTcAmKRWbt/EghK5CPLAIbTp0/nKO9mSjl 3tqPCpv0vM48FRLDXM7jKWjRROfQKieiKO62YHmWPFNHg3K7NM8eY0GM7Fn/MIJpE4 OX/5s9KvkpQKxtGm7qCu37vzxkW5/CNXI8cP46ed6aWEbBKkgXbrdmuByB0BE9QQA+ rRWisSyMz+jmPNBg+EVvPftMrLJyWcw239dBUpK75oHg+HY7ToD4zq23jxGH9anAP3 sv2WdgrSesdiQ== 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) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T8BTr1tG5z4wnx; Tue, 9 Jan 2024 11:22:55 +1100 (AEDT) Date: Tue, 9 Jan 2024 11:22:54 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20240109112254.405d3a1a@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bjorn Andersson , Linux Kernel Mailing List , Bjorn Andersson , Linux Next Mailing List , Dmitry Baryshkov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp.c between commit: fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()") from Linus' tree and commit: cd572b3bb27e ("drm/i915: Disable hotplug detection works during driver init/shutdown") from the drm-intel tree. I fixed it up (maybe, 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.c index 7d2b8ce48fda,93f9985ef75c..000000000000 --- a/drivers/gpu/drm/i915/display/intel_dp.c