From patchwork Thu Jun 17 01:42:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12326369 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4BF2C48BE5 for ; Thu, 17 Jun 2021 01:42:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1F21B6112D for ; Thu, 17 Jun 2021 01:42:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F21B6112D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C2F6E6E7DD; Thu, 17 Jun 2021 01:42:16 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF3C56E7DD; Thu, 17 Jun 2021 01:42:15 +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 4G54YJ1RNLz9sW4; Thu, 17 Jun 2021 11:42:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1623894134; bh=I1EcfeSL1oQCetBOruF67yYdf2PJDFYtyBZ2rB1ehNU=; h=Date:From:To:Cc:Subject:From; b=rvnCAdUgg3zRF9IGVMGrShXKe5oofww8eLNjaucazTK5ld5uO7c0LJwYH0RciSl6O v0HKsOCDOfGhKGJuOPr0GOd+q7WknFn8F/JfpXZw1PHiqvtB85QQTVMISFM2FaPHo9 xtGZBmgz5gwW4UA/u8AWZ0Kl3rRoVqL9AjAvmvYXG0yBKv70cC9EGiRpUW0D4bQQIf PR+Baek376m/yel4RLbIRMHMNmzkNkLnQ6Kbm03U75j/0i7jeP/CxXipbtJHgbqpi0 zTDNIb26+IN07zSsNLAvWBmSshdWOrhn1BCqKhHmAIdyITpwFV0bLjeCZWJV20TJt2 p2lfIYxfJzGuw== Date: Thu, 17 Jun 2021 11:42:11 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Message-ID: <20210617114211.335cfceb@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes 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: 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 tree got a conflict in: drivers/gpu/drm/vc4/vc4_hdmi.c between commit: 9984d6664ce9 ("drm/vc4: hdmi: Make sure the controller is powered in detect") from the drm-misc-fixes tree and commit: 6800234ceee0 ("drm/vc4: hdmi: Convert to gpiod") from the drm 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 8106b5634fe1,3c4cc133e3df..000000000000 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c