public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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
Date: Fri, 16 Oct 2015 14:07:04 +1100	[thread overview]
Message-ID: <20151016140704.198b10d8@canb.auug.org.au> (raw)

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 {

next             reply	other threads:[~2015-10-16  3:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-16  3:07 Stephen Rothwell [this message]
2015-10-16 14:47 ` linux-next: manual merge of the dt-rh tree with the regulator tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151016140704.198b10d8@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=broonie@kernel$(echo .)org \
    --cc=lgirdwood@gmail$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=robherring2@gmail$(echo .)com \
    --cc=tomeu.vizoso@collabora$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox