diff --git a/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch b/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch index 7ba0724..eb3cc61 100644 --- a/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch +++ b/patches.qubes/0001-block-add-no_part_scan-module-parameter.patch @@ -18,7 +18,7 @@ diff --git a/block/genhd.c b/block/genhd.c index 9f42526..85b71f5 100644 --- a/block/genhd.c +++ b/block/genhd.c -@@ -572,6 +572,15 @@ exit: +@@ -628,6 +628,15 @@ WARN_ON(err); } @@ -32,9 +32,9 @@ index 9f42526..85b71f5 100644 +MODULE_PARM_DESC(no_part_scan, "When adding block devices, always mark them as not to be scanned for partitions"); + /** - * device_add_disk - add partitioning information to kernel list + * __device_add_disk - add disk information to kernel list * @parent: parent device for the disk -@@ -587,6 +596,9 @@ void device_add_disk(struct device *parent, struct gendisk *disk) +@@ -645,6 +654,9 @@ dev_t devt; int retval; diff --git a/patches.xen/pci_op-cleanup.patch b/patches.xen/pci_op-cleanup.patch index 79be7f8..4628732 100644 --- a/patches.xen/pci_op-cleanup.patch +++ b/patches.xen/pci_op-cleanup.patch @@ -53,12 +53,12 @@ Date: Wed Apr 1 17:01:26 2015 -0400 drivers/xen/xen-pciback/pciback_ops.c diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c -index b1ffebe..353c8a2 100644 +index 8785014..d458e53 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c -@@ -297,7 +297,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, +@@ -298,7 +298,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, } else { - dev_err(&dev->dev, "enable msix get err %x\n", err); + pci_err(dev, "enable msix get err %x\n", err); } - return err; + return err ? -EINVAL : 0; @@ -66,13 +66,13 @@ index b1ffebe..353c8a2 100644 static void pci_frontend_disable_msix(struct pci_dev *dev) diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c -index fa2b222..4db6c19 100644 +index ee2c891..573590b 100644 --- a/drivers/xen/xen-pciback/pciback_ops.c +++ b/drivers/xen/xen-pciback/pciback_ops.c -@@ -266,7 +266,7 @@ error: +@@ -268,7 +268,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev, if (dev_data) dev_data->ack_intr = 0; - + - return result > 0 ? 0 : result; + return result >= 0 ? 0 : XEN_PCI_ERR_op_failed; } diff --git a/version b/version index 9bb7e62..469f283 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.15.16 +4.16.2