linux-next: manual merge of the pci tree with the pci-current tree

From: Mark Brown
Date: Wed Mar 12 2014 - 09:00:30 EST

Next message: Nicolas Ferre: "Re: [PATCH v5 0/9] Device Tree support for the at91sam9261ek"
Previous message: Boris BREZILLON: "Re: [PATCH v5 3/9] at91: pinctrl: don't request GPIOs used for interrupts but lock them as IRQ"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in drivers/pci/pci.c between commit 5f4fe7ad54087 ("PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled") from the pci-current tree and commit 1e2571a7813836 ("PCI: Enable INTx if BIOS left them disabled") from the pci tree.

I fixed it up resulting in the contents of pci-current and can carry the fix as necessary (no action is required).

Attachment: pgpisB6gOjTou.pgp
Description: PGP signature

Next message: Nicolas Ferre: "Re: [PATCH v5 0/9] Device Tree support for the at91sam9261ek"
Previous message: Boris BREZILLON: "Re: [PATCH v5 3/9] at91: pinctrl: don't request GPIOs used for interrupts but lock them as IRQ"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]