From patchwork Tue Nov 15 23:57:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13044292 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 600E6C4332F for ; Tue, 15 Nov 2022 23:57:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0257F10E115; Tue, 15 Nov 2022 23:57:11 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77B6810E0F9; Tue, 15 Nov 2022 23:57:06 +0000 (UTC) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NBjlN0Qr6z4xDK; Wed, 16 Nov 2022 10:57:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668556624; bh=SOAAR+njNw3INBbf23L+zGH83Vm3xaTAHvnq1EaTm9w=; h=Date:From:To:Cc:Subject:From; b=dFFEw71ZV9IPGSSlK8bMIhrvK/8LswAo675y4s0xoj8Fgx2vEVg/d0zAqCpC+KfW2 SLOHQqiTskERziUwvNS+PpxRYoYppcRNk7s7zCQdLXlGLAOFdewxgdp55TVhBhE3Qz VT5J23vwhNuwyuP8x40+oW+0ynF55YHlW+RfaXzWkaxQvJD92BaKfYBukng9UPXhoq 0sMzimdjNKJ8cfp/YkiOBb/VuWMQkWtvuWaxHuhSHstoeRrj1dSFOLt4W5nWDVsxE3 Ux6+Nt1yS+MBCNbkGojfL/lNzl6bjNsuXC34B5gCthzbb+WtWtQXQy9E7FP8cdwdos oaVfNwb6KKVFw== Date: Wed, 16 Nov 2022 10:57:02 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20221116105702.746ce3cf@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the origin tree 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: , Cc: =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= , Linux Next Mailing List , Linux Kernel Mailing List , Maxime Ripard Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vc4/vc4_hdmi.c between commit: 682f99b8ae88 ("drm/vc4: hdmi: Take our lock to reset the link") from the origin tree and commits: d218750805a3 ("drm/vc4: hdmi: Pass vc4_hdmi to vc4_hdmi_supports_scrambling()") 0a99962c0dbf ("drm/vc4: hdmi: Fix pointer dereference before check") from the drm-misc 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/vc4/vc4_hdmi.c index d7fcc7a4c082,6b223a5fcf6f..000000000000 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c