Update to kernel-4.16.2

pull/18/head
Frédéric Pierret 6 years ago
parent c138013c75
commit 67e33e0360
No known key found for this signature in database
GPG Key ID: 1DABC232BE02201E

@ -18,7 +18,7 @@ diff --git a/block/genhd.c b/block/genhd.c
index 9f42526..85b71f5 100644 index 9f42526..85b71f5 100644
--- a/block/genhd.c --- a/block/genhd.c
+++ b/block/genhd.c +++ b/block/genhd.c
@@ -572,6 +572,15 @@ exit: @@ -628,6 +628,15 @@
WARN_ON(err); 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"); +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 * @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; dev_t devt;
int retval; int retval;

@ -53,12 +53,12 @@ Date: Wed Apr 1 17:01:26 2015 -0400
drivers/xen/xen-pciback/pciback_ops.c drivers/xen/xen-pciback/pciback_ops.c
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.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 --- a/drivers/pci/xen-pcifront.c
+++ b/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 { } 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;
+ return err ? -EINVAL : 0; + return err ? -EINVAL : 0;
@ -66,13 +66,13 @@ index b1ffebe..353c8a2 100644
static void pci_frontend_disable_msix(struct pci_dev *dev) 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 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 --- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/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) if (dev_data)
dev_data->ack_intr = 0; dev_data->ack_intr = 0;
- return result > 0 ? 0 : result; - return result > 0 ? 0 : result;
+ return result >= 0 ? 0 : XEN_PCI_ERR_op_failed; + return result >= 0 ? 0 : XEN_PCI_ERR_op_failed;
} }

@ -1 +1 @@
4.15.16 4.16.2

Loading…
Cancel
Save