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

2018-10-30 Thread Rafael J. Wysocki
On Monday, October 29, 2018 3:01:24 AM CET Stephen Rothwell wrote: > > --Sig_/X_/swfdki+BZTJ8afk_lQqW > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in: > > drivers/cpuidle/go

linux-next: manual merge of the pm tree with Linus' tree

2018-10-28 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/cpuidle/governors/menu.c between commit: 8508cf3ffad4 ("sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD") from Linus' tree and commit: a7fe5190c03f ("cpuidle: menu: Remove get_loadavg() from the per

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

2015-11-08 Thread Rafael J. Wysocki
On Monday, November 09, 2015 10:45:12 AM Stephen Rothwell wrote: > Hi Rafael, Hi, > Today's linux-next merge of the pm tree got a conflict in: > > drivers/of/of_pci.c > include/linux/of_pci.h > > between commits: > > f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse > "linux,p

linux-next: manual merge of the pm tree with Linus' tree

2015-11-08 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/of/of_pci.c include/linux/of_pci.h between commits: f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only"") from Linus' tree and commit: 50230713b639 ("PCI: OF: Move of_pci_dma_

linux-next: manual merge of the pm tree with Linus' tree

2015-11-08 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/pci/probe.c between commit: b07461a8e45b ("PCI/AER: Clear error status registers during enumeration and restore") from Linus' tree and commit: 29dbe1f0af88 ("PCI: ACPI: Add support for PCI device DMA coherenc

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

2014-08-11 Thread Rafael J. Wysocki
On Monday, August 11, 2014 11:43:09 AM Stephen Rothwell wrote: > > --Sig_/=CGwKOD1=eH3=syU/3wkRPC > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in > arch/arm/mach-kirkwood/pm.c

linux-next: manual merge of the pm tree with Linus' tree

2014-08-10 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in arch/arm/mach-kirkwood/pm.c between commit ba364fc752da ("ARM: Kirkwood: Remove mach-kirkwood") from Linus' tree and commit bb3274b6442d ("PM / sleep: Rename symbols, functions and variables related to sleep") from the pm tree.

linux-next: manual merge of the pm tree with Linus' tree

2014-08-10 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in arch/arm/mach-imx/pm-imx6.c between commit 80c0ecdce802 ("ARM: imx: add standby mode support for suspend") from Linus' tree and commit bb3274b6442d ("PM / sleep: Rename symbols, functions and variables related to sleep") from the