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: 20641 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3002725wru; Tue, 15 Nov 2022 16:00:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf7EUTiZY3hoMT3dL0tfkgib9BvJAzrcRLIHksvg3FDa6MfXgLbmPwyMq5Z3rXWWCwpNxkl1 X-Received: by 2002:a17:906:4e0d:b0:7ad:b822:d2e4 with SMTP id z13-20020a1709064e0d00b007adb822d2e4mr15677499eju.35.1668556805618; Tue, 15 Nov 2022 16:00:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668556805; cv=none; d=google.com; s=arc-20160816; b=tfuAAm7SVmDG3mQbgqbDctI0ZfP8yi2X1Ofaj5h1obtFQOkQ6tnNHsV8IcOYPMhwIC KBtPpOS8m/eUXZ4vceXB2z4Y2fkQO2LlGi0jbdCIdFVommiEF3uGmizi32e7SwuMeGvY QDI/0OXTPzfMXpQ/X74eAbsjaYYcPt2+PJ7qHdyvqv4LjvO/ua+gr4VZSuhUX+eYZMkc GGL+B5ntmq01PYEGui9HlfLHgK7fofOKIiDTpMaI5fCUpvRPqZyqsw88W9Kdug4/1Rg+ w30eJX1yfJARWxknFmtLw53M8yKVsNzYZqx3MyLM+zinbjCLHpEQKjoETrCWLYlt7Bzh tOhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=SOAAR+njNw3INBbf23L+zGH83Vm3xaTAHvnq1EaTm9w=; b=zQtiRPruKMcUW3w18qendVIfp+QwEI6rAcOm2q3U1XStOzE4VLpfUUB7vfKg0RPf3z Gk+UMqo5vP1JROGsjX+KOMmxBgwTiFAgR6smrUeTHD0rXPu71XJyuGvfQy7ljhKlUdy7 lwyOg9M/jVxnwpchDp38DsQZGBZfzwrG3bVhIHSh/P8lZOhLeNPPakYcUZg5v4zTsOEE 3YLxYq3z8aBRg7DXS/MRq/JLaAUI+fJprKg9mT9pwSQE0QSdxNQqKXwmHfK2k+F1lh0X 0oz+BmGy5E8jdyNpby/W+H2zlP3j4wcQ6mXiVV/CUEKQA8dYZz0dHlpj/BYEEziGWqM9 E3zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=dFFEw71Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x14-20020aa7d6ce000000b00461d97e5287si11204182edr.344.2022.11.15.15.59.41; Tue, 15 Nov 2022 16:00:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=dFFEw71Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231216AbiKOX5J (ORCPT + 99 others); Tue, 15 Nov 2022 18:57:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231166AbiKOX5H (ORCPT ); Tue, 15 Nov 2022 18:57:07 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8356C1AF39; Tue, 15 Nov 2022 15:57:06 -0800 (PST) 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 Cc: =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= , Linux Kernel Mailing List , Linux Next Mailing List , Maxime Ripard Subject: linux-next: manual merge of the drm-misc tree with the origin tree Message-ID: <20221116105702.746ce3cf@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749608620887790735?= X-GMAIL-MSGID: =?utf-8?q?1749608620887790735?= 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