Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752067AbdFNN4A (ORCPT ); Wed, 14 Jun 2017 09:56:00 -0400 Received: from mail-yw0-f170.google.com ([209.85.161.170]:35841 "EHLO mail-yw0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756AbdFNNz6 (ORCPT ); Wed, 14 Jun 2017 09:55:58 -0400 MIME-Version: 1.0 In-Reply-To: <20170614125423.48266e23@canb.auug.org.au> References: <20170614125423.48266e23@canb.auug.org.au> From: Rob Herring Date: Wed, 14 Jun 2017 08:55:37 -0500 Message-ID: Subject: Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree To: Stephen Rothwell , Sakari Ailus Cc: Mark Brown , Linux-Next Mailing List , Linux Kernel Mailing List , Kuninori Morimoto Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 896 Lines: 26 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. Rob