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 S1751595AbcCAEHG (ORCPT <rfc822;w@1wt.eu>);
	Mon, 29 Feb 2016 23:07:06 -0500
Received: from ozlabs.org ([103.22.144.67]:46791 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750849AbcCAEHD (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 29 Feb 2016 23:07:03 -0500
Date: Tue, 1 Mar 2016 15:07:00 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mike Turquette <mturquette@baylibre.com>,
        Stephen Boyd <sboyd@codeaurora.org>,
        Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Chen-Yu Tsai <wens@csie.org>
Subject: linux-next: manual merge of the clk tree with the sunxi tree
Message-ID: <20160301150700.650fbd3e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/sunxi/clk-sun6i-ar100.c

between commit:

  3ca2377b6fed ("clk: sunxi: rewrite sun6i-ar100 using factors clk")

from the sunxi tree and commit:

  36bf2811416c ("clk: sunxi: Use proper type for of_clk_get_parent_count() return value")

from the clk tree.

I fixed it up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell