From mboxrd@z Thu Jan 1 00:00:00 1970 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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 4954FC3A5A1 for ; Mon, 26 Aug 2019 03:06:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C0BD2168B for ; Mon, 26 Aug 2019 03:06:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="DcqgXxue" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729405AbfHZDGo (ORCPT ); Sun, 25 Aug 2019 23:06:44 -0400 Received: from ozlabs.org ([203.11.71.1]:41625 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729403AbfHZDGo (ORCPT ); Sun, 25 Aug 2019 23:06:44 -0400 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 46Gxjq6nJQz9s7T; Mon, 26 Aug 2019 13:06:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1566788801; bh=ao4+tkZSNPxGhHnop5/uB0c25lKvBwr4pgEKllddgAQ=; h=Date:From:To:Cc:Subject:From; b=DcqgXxue3U+qpniOSwRvKEcQjSkM2i+VPn8GRJ0jY2ra05YOru62S7WOrCnR8ejY8 rVIdjuHyTCJiqazmPLx7jSI3QWIx8DGgtAK3rAp9qLyRSyVSyGLhXz1QO5vCL1qHcV hyptsAtmzvpKInJOjaxKw5f030CTZhTFdXyYUvaRqEd/2gpKa8Up9ptEfUJXDottn1 ItGK/tSsRHVLRoSYV4ncesgPGUcC8CkYDMzRnktZ7cvYw67n70kZfAs2nydzHWt/n/ rKZQ+aDBZyRrepbiWC+mfkjXJoYEwQocKMNKc+zskyTMVTtIwPoqEDsszkXKT7X8ME 2vgVpq0rIhpNg== Date: Mon, 26 Aug 2019 13:06:37 +1000 From: Stephen Rothwell To: Dave Airlie , DRI , Daniel Vetter , Intel Graphics Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mihail Atanassov , Ayan kumar halder , "James Qian Wang (Arm Technology China)" , Liviu Dudau Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20190826130637.176f6208@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/wydur/h7UBhnu/l7f8Ha7ul"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/wydur/h7UBhnu/l7f8Ha7ul Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/arm/display/komeda/komeda_dev.c between commit: 51a44a28eefd ("drm/komeda: Add missing of_node_get() call") from the drm-misc-fixes tree and commit: 8965ad8433ea ("drm/komeda: Enable dual-link support") 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/arm/display/komeda/komeda_dev.c index 9d4d5075cc64,1ff7f4b2c620..000000000000 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c @@@ -127,7 -128,8 +129,8 @@@ static int komeda_parse_pipe_dt(struct=20 pipe->of_output_port =3D of_graph_get_port_by_id(np, KOMEDA_OF_PORT_OUTPUT); =20 + pipe->dual_link =3D pipe->of_output_links[0] && pipe->of_output_links[1]; - pipe->of_node =3D np; + pipe->of_node =3D of_node_get(np); =20 return 0; } --Sig_/wydur/h7UBhnu/l7f8Ha7ul Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1jTL0ACgkQAVBC80lX 0Gxv3Qf/UZODeNlf0Cg6Pp21C0lTRqUfi6nfMnY9tk8fimcVVU7XczrGHYCdq9lh 2cix95QOpooh3Rr8edxYyYMnXNpP4l+Tt0yXFr1a7VGIX+mjZv35aY8Rw55L0WLC ja+YF6MBfyXQMaSxee3XRsqX3bHrnqwX5P84at39Q5+gHoGaqm4HPbGB9dslfYIX FG/D1pXucobj7tuKBDufUQcFcdmAvgt9uXqeveQ5mSAMToqtBM8d6F29lEan8A6H tzPQdiowwIb16nRya/Qu7IVW/I4QwJLwp5ykDPp9foeSGM7YWKejUXUroOkNt0V2 C0m6H2culOjxXPqbSRq1efBeyIXpEQ== =mbfu -----END PGP SIGNATURE----- --Sig_/wydur/h7UBhnu/l7f8Ha7ul--