Messages in this thread | | | Date | Tue, 28 Feb 2012 08:12:49 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the pci tree |
| |
On Tue, Feb 28, 2012 at 02:29:09PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > include/linux/pci.h between commit 6754b9e9c335 ("PCI: Rename > pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge") from the > pci tree and commit aad4f4000cec ("PCI: Add helper macro for > pci_register_driver boilerplate") from the driver-core tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks good to me, thanks for the fixup.
greg k-h
| |