Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752413AbdFNUwq (ORCPT ); Wed, 14 Jun 2017 16:52:46 -0400 Received: from mga06.intel.com ([134.134.136.31]:3230 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754AbdFNUwo (ORCPT ); Wed, 14 Jun 2017 16:52:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,341,1493708400"; d="scan'208";a="98051881" Subject: Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree To: Rob Herring , Stephen Rothwell Cc: Mark Brown , Linux-Next Mailing List , Linux Kernel Mailing List , Kuninori Morimoto References: <20170614125423.48266e23@canb.auug.org.au> From: Sakari Ailus Message-ID: Date: Wed, 14 Jun 2017 23:52:37 +0300 User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:49.0) Gecko/20100101 SeaMonkey/2.46 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1508 Lines: 44 Hi Rob, Rob Herring wrote: > On Tue, Jun 13, 2017 at 9:54 PM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the devicetree tree got a conflict in: >> >> drivers/of/base.c >> >> between commits: >> >> 4c9c3d595f1b ("of_graph: add of_graph_get_remote_endpoint()") >> 0ef472a973eb ("of_graph: add of_graph_get_port_parent()") >> ac1e6958d3be ("of_graph: add of_graph_get_endpoint_count()") >> >> from the sound-asoc tree and commit: >> >> 1df09bc66f9b ("of: Move OF property and graph API from base.c to property.c") >> >> from the devicetree tree. > > Sakari, I forgot about these other changes and the resolution is more > complex than I want to pass on to Linus. Has the branch I provided > been pulled in (I guess not since this is the first I've seen of the > conflict)? We should drop the move for now and do it late in the merge > window or post -rc1. It can be after your other changes. Good that this came up now --- I was about to send a pull request to Rafael. :-) So no, nothing has been pulled yet that would have included the immutable branch you provided. Regarding the fwnode cleanups through linux-pm on the dt/property-move branch --- I'm ok waiting for the next rc1. After that I'd like to get them in for I have patches for media-tree (of which not all are mine) that in turn depend on the fwnode cleanups. There still have been surprisingly few conflicts so far. -- Kind regards, Sakari Ailus sakari.ailus@linux.intel.com