linux-next: manual merge of the trivial tree with the pm tree

linux-next: manual merge of the trivial tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/devfreq/exynos4_bus.c between commit 8fa938acb318 ("PM / devfreq:
exynos4_bus: honor RCU lock usage") from the pm tree and commit
8a168ca7074b ("treewide: Fix typo in various drivers") from the trivial
tree.

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

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

diff --cc drivers/devfreq/exynos4_bus.c
index 46d94e9,e1ac076..0000000
--- a/drivers/devfreq/exynos4_bus.c
+++ b/drivers/devfreq/exynos4_bus.c
@@@ -658,7 -636,7 +658,7 @@@ static int exynos4_bus_target(struct de
  	if (old_freq == freq)
  		return 0;
  
- 	dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt);
 -	dev_dbg(dev, "targeting %lukHz %luuV\n", freq, opp_get_voltage(opp));
++	dev_dbg(dev, "targeting %lukHz %luuV\n", freq, new_oppinfo.volt);
  
  	mutex_lock(&data->lock);
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the trivial tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Hi,

On Wed, 3 Dec 2014 15:01:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (the pm tree change was a subset of the trivial tree one)
                                          ^^^^^^
superset

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the trivial tree with the pm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/pci/pci-driver.c between commit 0144fd0c8842 ("PCI / PM: Drop
CONFIG_PM_RUNTIME from the PCI core") from the pm tree and commit
2386dc4fb001 ("PCI: Fix comment typo 'COMFIG_PM_OPS") from the trivial
tree.

I fixed it up (the pm tree change was a subset of the trivial tree one)
and can carry the fix as necessary (no action is required).

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]