Message ID | 20240109112254.405d3a1a@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-20209-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp1359358dyq; Mon, 8 Jan 2024 16:23:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYJAS+99cG5ChCn4uYX8pMdlGPv8Iorg/3WOrQp21twXnwHM1kznmUsLAZ4UphvmC+DwN5 X-Received: by 2002:a17:907:31cc:b0:a23:713f:9851 with SMTP id xf12-20020a17090731cc00b00a23713f9851mr149094ejb.18.1704759805358; Mon, 08 Jan 2024 16:23:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704759805; cv=none; d=google.com; s=arc-20160816; b=HWgEsrChlGSECfVa0R35Ft9spnxNCHb+jkUC33bFQF0LcLePCENap5DPdakbjztnPv 3VxWzy2arQVH/DHWI03b4hFha5HyS6cS+TbfZ/9KbIw/5xk95bYW1sncNaJZMav1Hgzb iV2kd+1sIbqC30dAADxLPsXmg5rLNB3YXGo3SGjgNB8m73q6qxhni4R0o3McSz0VxEkM +ecIy7LP+bq4SELjFkpSlrId2B5e/w9iHmkfB7r3z0Cj1JpNyK7iEWaVzHfSJcQinYH0 ed+bkJKX6sBAJGJQEopSfM6N84DibjQ1KdL0j3fM3XrVUJxezW9W5f35elxy6uSiXi1f fsIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=UtD5+zFpbHH54Dk7I6pNkcSPwd78+kcXsfGz/v1610Y=; fh=za+y0PB3xgQGiCV/UO+J051NrpgEfQK/1wTcCCnSfiM=; b=PMhWyUQro0dzJc5eynuOJfvD1lhQPO+erYYEJLEsopWhZIHveP/EgZXLyqBdasMOZJ UadBXKD37yunPosH3Y0dvFdY7syrSOgjKBIlLIM5B5RCV1V3K8GotW+1kf61x9xAHfjI Y7FZYTvN1cwmMpZbvIehZklTAAWSOhSF2RuXdplpEVoXvOkKn22Mw0uaHEqv5CdHrEgT DuroEtXAKRuxQbefVBMA8HfnzA6/ODf3VDBfAwJmr9Zi4l04pSf2tbRhXa7EiXQNmn/g mdUOkYl++7JRV62lPWq8pqkeHGFpeCeVApJos9aHEp5xvOGuHWvf/uKBf0Zuz8++RYQ0 Qmsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="c/m8U+Qr"; spf=pass (google.com: domain of linux-kernel+bounces-20209-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20209-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id xa14-20020a170907b9ce00b00a2af996aedesi339890ejc.710.2024.01.08.16.23.25 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 16:23:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-20209-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="c/m8U+Qr"; spf=pass (google.com: domain of linux-kernel+bounces-20209-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20209-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BF1651F2417E for <ouuuleilei@gmail.com>; Tue, 9 Jan 2024 00:23:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BFF90258F; Tue, 9 Jan 2024 00:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="c/m8U+Qr" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 5516815A7; Tue, 9 Jan 2024 00:22:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au 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 <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: Bjorn Andersson <andersson@kernel.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Imre Deak <imre.deak@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20240109112254.405d3a1a@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/F6i/J4=GGUHLZ+nz4EgeNZT"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787570217378457962 X-GMAIL-MSGID: 1787570217378457962 |
Series |
linux-next: manual merge of the drm-intel tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Jan. 9, 2024, 12:22 a.m. UTC
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