Received: by 10.223.164.202 with SMTP id h10csp2906740wrb; Sun, 12 Nov 2017 21:59:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMZcFKSwPbkwdZPj9Yzm6B0s39/mDjt/Kl7qSZha2oBd6p+XaeGWJZqnxRh7VbFm1W9ubQi3 X-Received: by 10.159.203.197 with SMTP id r5mr7892516plo.431.1510552763308; Sun, 12 Nov 2017 21:59:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510552763; cv=none; d=google.com; s=arc-20160816; b=Rxq4tgIpfbhzv90oSQ/2sfXlqcTING/S/xSjEErTEW8bMHNWvDwp+s0RIGA+pzgEu/ MLm3n47brbDfDe0KNXy1OX/4y9BnUBLcMtFJDqP4dPx6qUb+qA2ftuW6CXM6erK6qYuY a2Kq8E4ORLVOQrX8zdvk1drCb2mknSo/UTPNY7uiMGcTcDDSSIM9d5N9vOljC5HnKwiW J0b8RaqrNy7t2d9syuIRicEjco0uK6K580E4OmCazgd7Zxpakmj1lrSj9JU+Cmyhl0MK W3LDLKW4uhLw9n2QQIQF6adOXA8LhiUsvbI2EFNPBUaOYWiVpgf1w80swqBbI8XA0NR2 dTrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature:arc-authentication-results; bh=ATnxVBVhC7z7ZgSMUV7URLv6TBpYPL+gqvm9E91T94g=; b=Uhm7M+itXxQT4gKxeaamX2GBJqTJ30PgD3XksSNg82xRwhdo5GcvEwMmZYWFUO3UnA sn/ngpIeRMukI3IEhGA5e7zIU08jo5ENOl1FRwm82zwsGWpf5M93+P+97ivgRby85ApY /JSS81rsYZ9LJPXxKk7yxe5Lan1M45ZmHEIbWTphBKuMnoWOkeE8EoxWVTAUk8bsFG7W NGWF0gShwOlkpP/lo27+ib3Fm7dIAVkipT17D4aVzE5bs1+8hFhD3vtIOOH1jmzgA4LA 2c7rh7fVRqASRQYvrJrnZKml8pw0Qm+FJiG6+rGxpOcygiEVvbQ54yUQ7XVoA2s9/xsZ n8Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tHsF7C/F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s194si5219088pgc.0.2017.11.12.21.59.11; Sun, 12 Nov 2017 21:59:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tHsF7C/F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751722AbdKMF6f (ORCPT + 88 others); Mon, 13 Nov 2017 00:58:35 -0500 Received: from ozlabs.org ([103.22.144.67]:34041 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308AbdKMF6d (ORCPT ); Mon, 13 Nov 2017 00:58:33 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3yb0Lc0LmTz9t2c; Mon, 13 Nov 2017 16:58:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1510552712; bh=g17LMT+NctWKLL1ELm38gIWa7f5R9fCCASiXPqB3xQE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=tHsF7C/FcIdJY2oih78BXvdzH8vbC7+QLeErqYIBa0o68gymByBxZrt+B5goo4eOI nq46DgHbzPyyG6HuxtNom2BRjrRA77x+itOIBqmA7CImUfHp0WWLvMawy/zJGPtwuN mRLlv5NnbHBY1tUWj3LxtWU1fpQNSUhW+db6VX3r0ksH519MRiFufk72ILoMD7UCFU rvlGdaC+ilA91Ebak1jouEb5t1h9cEJ4IW05Jdl7Qjs4xv0U9gaoXZPpzsKlgMe6Q3 QALzLqkaAzRh4+zpnQloPOHZb4YOcsGrWBRfd01A4YfZuolw6zT6fWtVh0QfieJ3Jq KQUDhIENTN4Kw== Date: Mon, 13 Nov 2017 16:58:31 +1100 From: Stephen Rothwell To: Rob Herring , Rob Herring , ave Airlie , DRI Cc: Mark Brown , Frank Rowand , Stephen Boyd , Jyri Sarha , Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree Message-ID: <20171113165831.19ebc9fa@canb.auug.org.au> In-Reply-To: <20171030203756.35brom4ulrbgqesv@sirena.co.uk> References: <20171030203756.35brom4ulrbgqesv@sirena.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Mon, 30 Oct 2017 20:37:56 +0000 Mark Brown wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: > > drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c > > between commit: > > 44cd3939c111b7 ("drm/tilcdc: Remove redundant OF_DETACHED flag setting") > > from the drm tree and commit: > > f948d6d8b792bb ("of: overlay: avoid race condition between applying multiple overlays") > > from the devicetree 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/tilcdc/tilcdc_slave_compat.c > index 482299a6f3b0,54025af534d4..000000000000 > --- a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c > @@@ -163,12 -162,8 +162,6 @@@ static struct device_node * __init tilc > return NULL; > } > > - ret = of_resolve_phandles(overlay); > - if (ret) { > - pr_err("%s: Failed to resolve phandles: %d\n", __func__, ret); > - return NULL; > - } > - of_node_set_flag(overlay, OF_DETACHED); > -- > return overlay; > } > Just a reminder that this conflict still exists. -- Cheers, Stephen Rothwell From 1582716362758856630@xxx Mon Oct 30 20:39:05 +0000 2017 X-GM-THRID: 1582716362758856630 X-Gmail-Labels: Inbox,Category Forums