On Thu, Mar 13, 2014 at 09:28:20AM -0600, Jens Axboe wrote: > On 03/12/2014 10:12 PM, Bjorn Helgaas wrote: > >On Wed, Feb 26, 2014 at 10:02:40AM +0100, Alexander Gordeev wrote: > >>Changes since v1: > >> - cciss: patch #1: a weird 'goto' removed; > >> - cciss: patch #2: pci_enable_msix_exact() used, not pci_enable_msix_range(); > >> - rsxx: patch dropped - no need to change anything; > >> > >>As result of deprecation of MSI-X/MSI enablement functions > >>pci_enable_msix() and pci_enable_msi_block() all drivers > >>using these two interfaces need to be updated to use the > >>new pci_enable_msi_range() or pci_enable_msi_exact() > >>and pci_enable_msix_range() or pci_enable_msix_exact() > >>interfaces. > >> > >>This change updates 'cciss' only, but there is also 'nvme' update > >>pending - I am waiting for Intel guys to clarify if they want to > >>route it thru their tree. If not, I will post the 'nvme' patch as > >>a follow-up to this series. > > > >Hi Jens, > > > >I'd like to get these merged during the v3.15 merge window. I'd be glad to > >review and apply them through my tree, unless you want to do it. They do > >depend on f7fc32c, which went in after the v3.14 merge window, which makes > >it a bit of a hassle. > > My 3.15/drivers (and core) branch are based off 3.14-rc3, so it > should be OK. I've queued them up, as it's mostly a followup to the > previous ones from Alexander. Oh-oh, cciss patch #2 requires commit 3ce4e86 ("PCI/MSI: Add pci_enable_msi_exact() and pci_enable_msix_exact()") which was pulled to 3.14-rc4 only. Sorry for failing to clarify that :( And I also notice 3111cc3 ("skd: Use pci_enable_msix_exact() instead of pci_enable_msix_range()") in your tree also should not compile :( > -- > Jens Axboe > -- Regards, Alexander Gordeev agordeev@xxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html