On Sat, Apr 11, 2015 at 2:30 AM, Greg KH <greg@xxxxxxxxx> wrote: > On Fri, Apr 10, 2015 at 05:54:26PM -0500, Bjorn Helgaas wrote: >> From: Michael S. Tsirkin <mst@xxxxxxxxxx> >> >> Rename msi_set_enable() to pci_msi_set_enable() and >> msix_clear_and_set_ctrl() to pci_msix_clear_and_set_ctrl(). >> >> No functional change. >> >> [bhelgaas: changelog, split into separate patch] >> Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> >> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> >> Reviewed-by: Fam Zheng <famz@xxxxxxxxxx> >> CC: stable@xxxxxxxxxxxxxxx >> --- >> drivers/pci/msi.c | 28 ++++++++++++++-------------- >> 1 file changed, 14 insertions(+), 14 deletions(-) > > How does this, and the other patch you marked for stable, relate to the > stable_kernel_rules.txt file that dictates what we can take for stable > patches? I fat-fingered the stable email address on the patches with the actual bug fixes, so you probably didn't see them. The candidates for stable are patches 1-4 of this series: PCI/MSI: Rename msi_set_enable(), msix_clear_and_set_ctrl() PCI/MSI: Export pci_msi_set_enable(), pci_msix_clear_and_set_ctrl() PCI/MSI: Disable MSI at enumeration even if kernel doesn't support MSI PCI/MSI: Don't disable MSI/MSI-X at shutdown The first two make no functional difference; the last two are the bug fixes. Bjorn -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html