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

2014-10-01 Thread Stephen Rothwell
Hi Alex, On Wed, 01 Oct 2014 11:06:14 -0600 Alex Williamson wrote: > > On Wed, 2014-10-01 at 13:14 +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the vfio tree got a conflict in > > drivers/pci/msi.c between commits a160fe94cb53 ("PCI/MSI: Remove unused > > get_cached_msi_ms

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

2014-10-01 Thread Alex Williamson
On Wed, 2014-10-01 at 13:14 +1000, Stephen Rothwell wrote: > Hi Alex, > > Today's linux-next merge of the vfio tree got a conflict in > drivers/pci/msi.c between commits a160fe94cb53 ("PCI/MSI: Remove unused > get_cached_msi_msg()") and 18ef822c59f6 ("PCI/MSI: Rename > __get_cached_msi_msg() to ge

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

2014-09-30 Thread Stephen Rothwell
Hi Alex, Today's linux-next merge of the vfio tree got a conflict in drivers/pci/msi.c between commits a160fe94cb53 ("PCI/MSI: Remove unused get_cached_msi_msg()") and 18ef822c59f6 ("PCI/MSI: Rename __get_cached_msi_msg() to get_cached_msi_msg()") from the pci tree and commit 3b307ffe3faa ("PCI: E