From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752607AbcDATGc (ORCPT <rfc822;w@1wt.eu>);
	Fri, 1 Apr 2016 15:06:32 -0400
Received: from muru.com ([72.249.23.125]:49624 "EHLO muru.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751035AbcDATGa (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 1 Apr 2016 15:06:30 -0400
Date: Fri, 1 Apr 2016 12:06:27 -0700
From: Tony Lindgren <tony@atomide.com>
To: Tero Kristo <t-kristo@ti.com>
Cc: Keerthy <a0393675@ti.com>, mark.rutland@arm.com,
        devicetree@vger.kernel.org, Lokesh Vutla <lokeshvutla@ti.com>,
        Keerthy <j-keerthy@ti.com>, linux-kernel@vger.kernel.org,
        robh+dt@kernel.org, galak@codeaurora.org, linux-omap@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2] ARM: dts: dra7: Correct clock tree for sys_32k_ck
Message-ID: <20160401190627.GO9329@atomide.com>
References: <1457957001-720-1-git-send-email-j-keerthy@ti.com>
 <20160330211828.GE9329@atomide.com>
 <20160330213224.GH9329@atomide.com>
 <56FCC3FF.7080901@ti.com>
 <56FCEC61.5020400@ti.com>
 <20160331170017.GI9329@atomide.com>
 <20160401153606.GJ9329@atomide.com>
 <56FEC297.50102@ti.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <56FEC297.50102@ti.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

* Tero Kristo <t-kristo@ti.com> [160401 11:50]:
> 
> Looks like a merge conflict to me, sys_32k_ck has gone under clockdomains
> for some reason. It should be under clocks.

Oh OK, I'll wait for an updated patch against v4.6-rc1 then.
Might be worth checking it applies cleanly against
omap-for-v4.6/fixes-rc1 too.

Regards,

Tony