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

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

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

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 u

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

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 i