Received: by 10.223.164.202 with SMTP id h10csp367328wrb; Mon, 13 Nov 2017 07:43:16 -0800 (PST) X-Google-Smtp-Source: AGs4zMarg34CmAF9cWoVhq3eN/3VAViGJ7soTLzs96Vhce/BaHINA2wvcOXXlj4NpbIaD7sMLYPw X-Received: by 10.84.149.102 with SMTP id b35mr9205665plh.331.1510587796875; Mon, 13 Nov 2017 07:43:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510587796; cv=none; d=google.com; s=arc-20160816; b=Uk7SI97zOnHl4D9RhJV6riI1dU4Z9W1QR+z1gM+pGQ+uzQCKLHW5k0uMaYlX3eYLi1 J8i46pnYujQBX6yqVWmSqmgyKdAUiBPewLcWOYZoaQCKyDr5we40uzyGUUiPqDspq1Zf bhH8tXVra1s9DjGYbPeUeUiY/n9JuwHyvb3ltTzjt/6xQI/VwdYW/0LEECBkTQkD1n+g y8v/Lk6B6w+YfEYyzYEzHFK0l06wJCz3C6Ga+NAC0LRe2mbwdhdgzwxgKqFxkTRYQe75 YG9nzUvSi8z3tuvrfmmQ85pjOwI0hXH8N7aEMMgxZkzqPvwIzKyS85DLBwSzT+TJ2ELG rzFw== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature :arc-authentication-results; bh=9isL1VrUdGVoCVk3ob6iiVmAIc9HxrGxj61+AU7FCZY=; b=oq5PmE3jSY+5KwX83O+le8weTt9f1V0SDZQa6ISORhq+FWZtjJrjgd8FcYf422O3BE LOIg6hu3Dz2C10hjnPZ3hl3HrWVu/AXNAccfJkGQq9NteMIZPiwD6xVBLPnXzkOD6hiy gq9P/l6vfXJgTfMRMvhiDqAKbBQyYjYyQv6s34nXJ8VyVam1lvSU6BrBR8M5x/QpecO2 uDauxhIPwt+vXxtz6lftoofLzevc/7dN73fJgkrs88YLDP9TjjT1yxLirkiH1xyidGDn RppSrrSVRGKtv7gpq6DDx/32LyK7XpuQWYq04+a1EFw2a7PaI+8F02I8BdyloUz9zOK3 h+dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=FZNCCedy; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z19si15971637pff.195.2017.11.13.07.43.04; Mon, 13 Nov 2017 07:43:16 -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=@ti.com header.s=ti-com-17Q1 header.b=FZNCCedy; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753374AbdKMPlM (ORCPT + 88 others); Mon, 13 Nov 2017 10:41:12 -0500 Received: from lelnx194.ext.ti.com ([198.47.27.80]:13936 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753333AbdKMPlK (ORCPT ); Mon, 13 Nov 2017 10:41:10 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id vADFewuA007919; Mon, 13 Nov 2017 09:40:58 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1510587658; bh=ElfbFRfIUZdxPi2Pe9UTe3zdZ5pX1/kbKKo9GWR7IMo=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=FZNCCedy1ZPGDan4C4vnn0Uraru3b+SwLCrk/Q1n6EjOhmrSmBTmZiMfnAsaxvmv6 D2jfTvcjd9zjgsvtGJbcPaMrfgB+QZTnhfnJ2kcxdlGCcP20PqL5D8sMSVsxJKVtnX z76gwYxpcAat6QfJoY7UvMJTQukXMDUT0w9w1RaM= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id vADFewMj003523; Mon, 13 Nov 2017 09:40:58 -0600 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Mon, 13 Nov 2017 09:40:58 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Mon, 13 Nov 2017 09:40:58 -0600 Received: from [10.1.3.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id vADFetWL024319; Mon, 13 Nov 2017 09:40:56 -0600 Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree To: Stephen Rothwell , Rob Herring , Rob Herring , ave Airlie , DRI CC: Mark Brown , Frank Rowand , Stephen Boyd , Linux-Next Mailing List , Linux Kernel Mailing List References: <20171030203756.35brom4ulrbgqesv@sirena.co.uk> <20171113165831.19ebc9fa@canb.auug.org.au> From: Jyri Sarha Message-ID: <153e4593-2ebb-c091-49c8-b8d44d5caeb5@ti.com> Date: Mon, 13 Nov 2017 17:40:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20171113165831.19ebc9fa@canb.auug.org.au> Content-Type: text/plain; charset="utf-8" Content-Language: en-GB Content-Transfer-Encoding: 8bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/13/17 07:58, Stephen Rothwell wrote: > 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. > After some consideration, I think we can drop the dts backward compatibility code from drm/tilcdc. It seems that it is causing a lot of trouble and I do not even know if anybody uses it anymore. Here is a patch for dropping it: https://lists.freedesktop.org/archives/dri-devel/2017-November/157394.html I did not plan to merge it before v4.16, but if this is a bigger problem I can push is right now for v4.15. Best regards, Jyri -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki From 1583929374269681685@xxx Mon Nov 13 05:59:23 +0000 2017 X-GM-THRID: 1582716362758856630 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread