Hi all,
Today's linux-next merge of the pm tree got a conflict in:
Documentation/power/pm_qos_interface.rst
between commits:
151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
562fe2ef1a21 ("PM / QOS: Pass request type to dev_pm_qos_read_value()")
from the pci tree
Hi Rafael,
On Wed, Feb 11, 2015 at 02:03:49AM +, Rafael J. Wysocki wrote:
> On Wednesday, February 11, 2015 02:41:35 AM Rafael J. Wysocki wrote:
> > On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
> > > Hi Rafael,
> > >
> > > Today's linux-next merge of the pm tree got a
On Wednesday, February 11, 2015 02:41:35 AM Rafael J. Wysocki wrote:
> On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > Today's linux-next merge of the pm tree got a conflict in
> > drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
> >
On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
> resources on failure in of_pci_get_host_bridge_resources()") from the
> pci tree and
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
resources on failure in of_pci_get_host_bridge_resources()") from the
pci tree and commit 5c493df25a0d ("Merge branch 'pci/host-generic' of
On Wednesday, February 11, 2015 02:41:35 AM Rafael J. Wysocki wrote:
On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/of/of_pci.c between commit d2be00c0fb5a (of/pci: Free
resources on
Hi Rafael,
On Wed, Feb 11, 2015 at 02:03:49AM +, Rafael J. Wysocki wrote:
On Wednesday, February 11, 2015 02:41:35 AM Rafael J. Wysocki wrote:
On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/of/of_pci.c between commit d2be00c0fb5a (of/pci: Free
resources on failure in of_pci_get_host_bridge_resources()) from the
pci tree and commit
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/of/of_pci.c between commit d2be00c0fb5a (of/pci: Free
resources on failure in of_pci_get_host_bridge_resources()) from the
pci tree and commit 5c493df25a0d (Merge branch 'pci/host-generic' of
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in MAINTAINERS
between commit 15fd830dd310 ("MAINTAINERS: Add ACPI folks for
ACPI-related things under drivers/pci") from the pci tree and commit
994b942fb4eb ("ACPI: Update MAINTAINERS file to include
Documentation/acpi") from the
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in MAINTAINERS
between commit 15fd830dd310 (MAINTAINERS: Add ACPI folks for
ACPI-related things under drivers/pci) from the pci tree and commit
994b942fb4eb (ACPI: Update MAINTAINERS file to include
Documentation/acpi) from the pm
On Tuesday, April 16, 2013 12:46:11 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/scan.c between commit 5c0b04e3d913 ("PCI/ACPI: Handle PCI
> slot devices when creating/destroying PCI buses") from the pci tree and
> commit
On Tuesday, April 16, 2013 12:46:11 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commit 5c0b04e3d913 (PCI/ACPI: Handle PCI
slot devices when creating/destroying PCI buses) from the pci tree and
commit
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commit 5c0b04e3d913 ("PCI/ACPI: Handle PCI
slot devices when creating/destroying PCI buses") from the pci tree and
commit 0a34764411aa ("ACPI / scan: Make memory hotplug driver use struct
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commit 5c0b04e3d913 (PCI/ACPI: Handle PCI
slot devices when creating/destroying PCI buses) from the pci tree and
commit 0a34764411aa (ACPI / scan: Make memory hotplug driver use struct
Hi,
On Wednesday, February 20, 2013 12:55:55 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't
> cache _PRT, and don't associate them with bus numbers") from the pci tree
>
Hi,
On Wednesday, February 20, 2013 12:55:55 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/pci/pci-acpi.c between commit 181380b702ee (PCI/ACPI: Don't
cache _PRT, and don't associate them with bus numbers) from the pci tree
and
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't
cache _PRT, and don't associate them with bus numbers") from the pci tree
and commit bc9b6407bd6d ("ACPI / PM: Rework the handling of devices
depending on
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/pci/pci-acpi.c between commit 181380b702ee (PCI/ACPI: Don't
cache _PRT, and don't associate them with bus numbers) from the pci tree
and commit bc9b6407bd6d (ACPI / PM: Rework the handling of devices
depending on power
Hi Stephen,
On Monday, February 18, 2013 12:11:05 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/internal.h between commits 668192b67820 ("PCI: acpiphp: Move
> host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI:
Hi Stephen,
On Monday, February 18, 2013 12:17:07 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/scan.c between commits 668192b67820 ("PCI: acpiphp: Move
> host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI:
Hi Stephen,
On Monday, February 18, 2013 12:17:07 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commits 668192b67820 (PCI: acpiphp: Move
host bridge hotplug to pci_root.c) and ab1a2e038ff2 (ACPI / PCI: Make
Hi Stephen,
On Monday, February 18, 2013 12:11:05 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commits 668192b67820 (PCI: acpiphp: Move
host bridge hotplug to pci_root.c) and ab1a2e038ff2 (ACPI / PCI: Make
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commits 668192b67820 ("PCI: acpiphp: Move
host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI: Make
pci_slot built-in only, not a module") from the pci tree and commits
4daeaf68379f
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commits 668192b67820 ("PCI: acpiphp: Move
host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI: Make
pci_slot built-in only, not a module") from the pci tree and commit
00c43b968250
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commits 668192b67820 (PCI: acpiphp: Move
host bridge hotplug to pci_root.c) and ab1a2e038ff2 (ACPI / PCI: Make
pci_slot built-in only, not a module) from the pci tree and commit
00c43b968250 (ACPI
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commits 668192b67820 (PCI: acpiphp: Move
host bridge hotplug to pci_root.c) and ab1a2e038ff2 (ACPI / PCI: Make
pci_slot built-in only, not a module) from the pci tree and commits
4daeaf68379f (ACPI /
On Friday, February 15, 2013 12:23:13 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got conflicts in
> drivers/acpi/scan.c and drivers/pci/hotplug/acpiphp_glue.c between
> commits 668192b67820 ("PCI: acpiphp: Move host bridge hotplug to
> pci_root.c") and
On Friday, February 15, 2013 12:23:13 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got conflicts in
drivers/acpi/scan.c and drivers/pci/hotplug/acpiphp_glue.c between
commits 668192b67820 (PCI: acpiphp: Move host bridge hotplug to
pci_root.c) and
Hi Rafael,
Today's linux-next merge of the pm tree got conflicts in
drivers/acpi/scan.c and drivers/pci/hotplug/acpiphp_glue.c between
commits 668192b67820 ("PCI: acpiphp: Move host bridge hotplug to
pci_root.c") and be6d2867b4f6 ("PCI: acpiphp: Remove dead code for PCI
host bridge hotplug") from
Hi Rafael,
Today's linux-next merge of the pm tree got conflicts in
drivers/acpi/scan.c and drivers/pci/hotplug/acpiphp_glue.c between
commits 668192b67820 (PCI: acpiphp: Move host bridge hotplug to
pci_root.c) and be6d2867b4f6 (PCI: acpiphp: Remove dead code for PCI
host bridge hotplug) from the
Hi,
On Wednesday, January 30, 2013 07:35:51 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/internal.h between commit 668192b67820 ("PCI: acpiphp: Move
> host bridge hotplug to pci_root.c") from the pci tree and commit
>
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commit 668192b67820 ("PCI: acpiphp: Move
host bridge hotplug to pci_root.c") from the pci tree and commit
2c545601d933 ("ACPI / PCI: Make PCI root driver use struct
acpi_scan_handler") from the pm
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commit 668192b67820 (PCI: acpiphp: Move
host bridge hotplug to pci_root.c) from the pci tree and commit
2c545601d933 (ACPI / PCI: Make PCI root driver use struct
acpi_scan_handler) from the pm
Hi,
On Wednesday, January 30, 2013 07:35:51 PM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commit 668192b67820 (PCI: acpiphp: Move
host bridge hotplug to pci_root.c) from the pci tree and commit
2c545601d933
On Thu, Jan 10, 2013 at 6:12 AM, Rafael J. Wysocki wrote:
> Hi,
>
> On Thursday, January 10, 2013 11:28:36 AM Stephen Rothwell wrote:
>> Hi Rafael,
>>
>> Today's linux-next merge of the pm tree got a conflict in
>> drivers/acpi/pci_root.c between commit 3c449ed00759 ("PCI/ACPI: Reserve
>>
Hi,
On Thursday, January 10, 2013 11:28:36 AM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/pci_root.c between commit 3c449ed00759 ("PCI/ACPI: Reserve
> firmware-allocated resources for hot-added root buses") from the pci tree
>
On Thu, Jan 10, 2013 at 6:12 AM, Rafael J. Wysocki r...@sisk.pl wrote:
Hi,
On Thursday, January 10, 2013 11:28:36 AM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/pci_root.c between commit 3c449ed00759 (PCI/ACPI: Reserve
Hi,
On Thursday, January 10, 2013 11:28:36 AM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/pci_root.c between commit 3c449ed00759 (PCI/ACPI: Reserve
firmware-allocated resources for hot-added root buses) from the pci tree
and
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/pci_root.c between commit 3c449ed00759 ("PCI/ACPI: Reserve
firmware-allocated resources for hot-added root buses") from the pci tree
and commit 47525cda88f5 ("ACPI / PCI: Fold acpi_pci_root_start() into
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/pci_root.c between commit 3c449ed00759 (PCI/ACPI: Reserve
firmware-allocated resources for hot-added root buses) from the pci tree
and commit 47525cda88f5 (ACPI / PCI: Fold acpi_pci_root_start() into
On Tuesday, November 06, 2012 09:52:40 AM Bjorn Helgaas wrote:
> On Mon, Nov 5, 2012 at 7:48 PM, Stephen Rothwell
> wrote:
> > Hi Rafael,
> >
> > Today's linux-next merge of the pm tree got a conflict in
> > arch/x86/pci/acpi.c between commit 3f385fa9edce ("x86/PCI: Ignore _SEG on
> > HP
On Tuesday, November 06, 2012 09:52:40 AM Bjorn Helgaas wrote:
On Mon, Nov 5, 2012 at 7:48 PM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/x86/pci/acpi.c between commit 3f385fa9edce (x86/PCI: Ignore _SEG on
HP
On Mon, Nov 5, 2012 at 7:48 PM, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/x86/pci/acpi.c between commit 3f385fa9edce ("x86/PCI: Ignore _SEG on
> HP xw9300") from the pci tree and commit 97a7108a3c00 ("ACPI / x86: Add
> quirk for
On Mon, Nov 5, 2012 at 7:48 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/x86/pci/acpi.c between commit 3f385fa9edce (x86/PCI: Ignore _SEG on
HP xw9300) from the pci tree and commit 97a7108a3c00 (ACPI / x86: Add
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/x86/pci/acpi.c between commit 3f385fa9edce ("x86/PCI: Ignore _SEG on
HP xw9300") from the pci tree and commit 97a7108a3c00 ("ACPI / x86: Add
quirk for "CheckPoint P-20-00" to not use bridge _CRS_ info") from the pm
tree.
I
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/x86/pci/acpi.c between commit 3f385fa9edce (x86/PCI: Ignore _SEG on
HP xw9300) from the pci tree and commit 97a7108a3c00 (ACPI / x86: Add
quirk for CheckPoint P-20-00 to not use bridge _CRS_ info) from the pm
tree.
I fixed
47 matches
Mail list logo
