From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932463AbcDYMyt (ORCPT ); Mon, 25 Apr 2016 08:54:49 -0400 Received: from foss.arm.com ([217.140.101.70]:45843 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932283AbcDYMys (ORCPT ); Mon, 25 Apr 2016 08:54:48 -0400 Date: Mon, 25 Apr 2016 13:54:41 +0100 From: Will Deacon To: Stefano Stabellini Cc: linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com, catalin.marinas@arm.com, shannon.zhao@linaro.org, linux-kernel@vger.kernel.org, peter.huangpeng@huawei.com Subject: Re: [PATCH] make dt_scan_depth1_nodes more readable Message-ID: <20160425125440.GN16065@arm.com> References: <20160425105340.GE16065@arm.com> <20160425111938.GK16065@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 25, 2016 at 12:24:03PM +0100, Stefano Stabellini wrote: > On Mon, 25 Apr 2016, Will Deacon wrote: > > On Mon, Apr 25, 2016 at 12:04:53PM +0100, Stefano Stabellini wrote: > > > On Mon, 25 Apr 2016, Will Deacon wrote: > > > > On Mon, Apr 25, 2016 at 11:25:11AM +0100, Stefano Stabellini wrote: > > > > > From: Mark Rutland > > > > > > > > > > Improve the readability of dt_scan_depth1_nodes by removing the nested > > > > > conditionals. > > > > > > > > > > Signed-off-by: Mark Rutland > > > > > Signed-off-by: Stefano Stabellini > > > > > > > > > > --- > > > > > > > > > > Note: this patch is based on xentip/for-linus-4.7 > > > > > > > > So how should I merge it? :/ > > > > > > I think that if you would like to merge it, it would be easier this time > > > for me to carry it in my tree. Otherwise you would have to base your > > > for-linus-4.7 on xentip/for-linus-4.7 and send the pull request after > > > the Xen pull request -- undesirable. > > > > Ok, doesn't look like we'll run into conflicts. I just find it weird that > > you'd have a patch with no functional change as a dependency, hence my > > preference to queue it in the arm64 tree (where conflicts are more likely). > > I see, that makes sense. In that case, would you be happy to take: > > https://git.kernel.org/cgit/linux/kernel/git/xen/tip.git/commit/?h=for-linus-4.7&id=df115bb0a0b8ad2f6dc62f8d094c21e77b367e7c > > in your tree? That would get rid of any cross dependecies between the > two tree. I can take that and the other patch on top too. Will