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 S1752365AbbJPDHM (ORCPT <rfc822;w@1wt.eu>);
	Thu, 15 Oct 2015 23:07:12 -0400
Received: from ozlabs.org ([103.22.144.67]:51805 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751414AbbJPDHK (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 15 Oct 2015 23:07:10 -0400
Date: Fri, 16 Oct 2015 14:07:04 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>, Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Tomeu Vizoso <tomeu.vizoso@collabora.com>
Subject: linux-next: manual merge of the dt-rh tree with the regulator tree
Message-ID: <20151016140704.198b10d8@canb.auug.org.au>
X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu)
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 Rob,

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

  drivers/regulator/core.c

between commit:

  85f3b4311629 ("regulator: core: Remove regulator_list")

from the regulator tree and commit:

  5634acd9c8e3 ("regulator: core: Probe regulators on demand")

from the dt-rh tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/regulator/core.c
index 7896ef53ff86,c2e5c2ae85c1..000000000000
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -1421,9 -1341,11 +1422,10 @@@ static struct regulator_dev *regulator_
  	if (dev && dev->of_node) {
  		node = of_get_regulator(dev, supply);
  		if (node) {
+ 			of_device_probe(node);
 -			list_for_each_entry(r, &regulator_list, list)
 -				if (r->dev.parent &&
 -					node == r->dev.of_node)
 -					return r;
 +			r = of_find_regulator_by_node(node);
 +			if (r)
 +				return r;
  			*ret = -EPROBE_DEFER;
  			return NULL;
  		} else {