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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAErSpo6vWrpJ-y4dGp3pa65UZUm50nzW-QfXji8tdYjh-OU_AA@mail.gmail.com>
Date:	Thu, 10 Jan 2013 11:30:06 -0700
From:	Bjorn Helgaas <bhelgaas@...gle.com>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yinghai Lu <yinghai@...nel.org>
Subject: Re: linux-next: manual merge of the pm tree with the pci tree

On Thu, Jan 10, 2013 at 6:12 AM, Rafael J. Wysocki <rjw@...k.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
>> firmware-allocated resources for hot-added root buses") from the pci tree
>> and commit 47525cda88f5 ("ACPI / PCI: Fold acpi_pci_root_start() into
>> acpi_pci_root_add()") from the pm tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Thanks for the fixup and please carry it for now (the conflict should go away
> when Bjorn pulls from my acpi-scan branch).

I pulled from acpi-scan and put it in my -next branch.

I had done this yesterday, but botched the conflict resolution
(thanks, Stephen, for showing me the correct resolution).  So I
recreated my pci/yinghai-survey-resources+acpi-scan branch, re-did the
merge, the force-updated both my
pci/yinghai-survey-resources+acpi-scan and next branches.

Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/