Re: linux-next: manual merge of the driver-core tree with the pci tree

On Thu, Nov 29, 2012 at 03:03:40PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/pci/pci.h between commit 4e15c46bdc4d ("PCI: Add pci_device_type > to pdev's device struct") from the pci tree and commit b40b97ae736c > ("P

Re: linux-next: manual merge of the driver-core tree with the pci tree

On Thu, Nov 29, 2012 at 03:06:41PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/pci/quirks.c between commit 21c5fd97380b ("PCI: Add workaround > for PLX PCI 9050 BAR alignment erratum") from the pci tree and commit > 158

linux-next: manual merge of the driver-core tree with the pci tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/pci/quirks.c between commit 21c5fd97380b ("PCI: Add workaround for PLX PCI 9050 BAR alignment erratum") from the pci tree and commit 15856ad50bf5 ("PCI: Remove __dev* markings") from the driver-core tree. I fixed

linux-next: manual merge of the driver-core tree with the pci tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/pci/pci.h between commit 4e15c46bdc4d ("PCI: Add pci_device_type to pdev's device struct") from the pci tree and commit b40b97ae736c ("PCI: Remove CONFIG_HOTPLUG ifdefs") from the driver-core tree. I fixed it up (