Update to kernel-5.6-rc4

0001-xen-netfront-detach-crash.patch

@@ -1,4 +1,4 @@
-From a6b3add4337101ef875423c0888b8ac1cde47c2c Mon Sep 17 00:00:00 2001
+From 8d6ba0309addc61bdd135aceecd320acd494ded3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Thu, 6 Sep 2018 15:09:44 +0200
@@ -34,5 +34,5 @@ index 482c6c8b0fb7..8f0a790ec5e7 100644
  		queue->grant_tx_ref[i] = GRANT_INVALID_REF;
  		add_id_to_freelist(&queue->tx_skb_freelist, queue->tx_skbs, i);
 -- 
-2.21.0
+2.20.1
 

0002-mce-hide-EBUSY-initialization-error-on-Xen.patch

@@ -1,4 +1,4 @@
-From a58197258286cf8dce45cf03b3b2b436b3cf8a99 Mon Sep 17 00:00:00 2001
+From 125a24bdd85904ada1e7f7cd42632f92cc1205a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Tue, 5 Jan 2016 02:44:04 +0100
@@ -39,7 +39,7 @@ Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
-index 743370ee4983..3af7521b2279 100644
+index 2c4f949611e4..d29dd999701d 100644
 --- a/arch/x86/kernel/cpu/mce/core.c
 +++ b/arch/x86/kernel/cpu/mce/core.c
 @@ -51,6 +51,10 @@
@@ -52,8 +52,8 @@ index 743370ee4983..3af7521b2279 100644
 +
  #include "internal.h"
 
- static DEFINE_MUTEX(mce_log_mutex);
-@@ -2464,6 +2468,11 @@ static __init int mcheck_init_device(void)
+ /* sysfs synchronization */
+@@ -2515,6 +2519,11 @@ static __init int mcheck_init_device(void)
  	free_cpumask_var(mce_device_initialized);
 
  err_out:
@@ -66,5 +66,5 @@ index 743370ee4983..3af7521b2279 100644
 
  	return err;
 -- 
-2.21.0
+2.20.1
 

0003-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch

@@ -1,4 +1,4 @@
-From da15c0c3af84be25fdd695dddf61524099f4322e Mon Sep 17 00:00:00 2001
+From c063ba61e9f3a362d5ad7c6cdfff346cc7148dca Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Sat, 30 Jan 2016 01:53:26 +0100
@@ -10,7 +10,7 @@ Ease debugging of PCI passthrough problems.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
-index 6c8843968a52..54d2e30683c4 100644
+index 499eff7d3f65..edfba6329b47 100644
 --- a/drivers/xen/events/events_base.c
 +++ b/drivers/xen/events/events_base.c
 @@ -522,7 +522,7 @@ static unsigned int __startup_pirq(unsigned int irq)
@@ -23,5 +23,5 @@ index 6c8843968a52..54d2e30683c4 100644
  	}
  	evtchn = bind_pirq.port;
 -- 
-2.21.0
+2.20.1
 

0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch

@@ -1,4 +1,4 @@
-From 1b9928a04716a54933dcaff9ec7e68323f58090b Mon Sep 17 00:00:00 2001
+From 292834034fc24dfd44e59d2e5f4b74cc63f37a17 Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <[email protected]>
 Date: Mon, 11 Jun 2012 22:49:31 +0200
 Subject: [PATCH] pvops: respect 'removable' xenstore flag for block devices
@@ -10,18 +10,18 @@ by normal user.
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index a74d03913822..e76b999fceca 100644
+index e2ad6bba2281..3929b4e63ff7 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -2339,6 +2339,7 @@ static void blkfront_connect(struct blkfront_info *info)
+@@ -2337,6 +2337,7 @@ static void blkfront_connect(struct blkfront_info *info)
  	unsigned int binfo;
  	char *envp[] = { "RESIZE=1", NULL };
  	int err, i;
 +	int removable;
 
  	switch (info->connected) {
  	case BLKIF_STATE_CONNECTED:
-@@ -2406,6 +2407,12 @@ static void blkfront_connect(struct blkfront_info *info)
+@@ -2404,6 +2405,12 @@ static void blkfront_connect(struct blkfront_info *info)
  		}
  	}
 
@@ -35,5 +35,5 @@ index a74d03913822..e76b999fceca 100644
  				  physical_sector_size);
  	if (err) {
 -- 
-2.21.0
+2.20.1
 

0005-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch

@@ -1,4 +1,4 @@
-From 61d8059c42eaf388b857e0d5c8460ccb76c2f97c Mon Sep 17 00:00:00 2001
+From adeff427d5cd336457e4138d2d3056b8645bb973 Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <[email protected]>
 Date: Sun, 15 Jul 2012 19:57:47 +0200
 Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
@@ -8,7 +8,7 @@ Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index e76b999fceca..db7d28ac9747 100644
+index 3929b4e63ff7..4131689b314e 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
 @@ -47,6 +47,7 @@
@@ -19,7 +19,7 @@ index e76b999fceca..db7d28ac9747 100644
 
  #include <xen/xen.h>
  #include <xen/xenbus.h>
-@@ -511,6 +512,9 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -508,6 +509,9 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
  			return 0;
  		return -EINVAL;
  	}
@@ -30,5 +30,5 @@ index e76b999fceca..db7d28ac9747 100644
  	default:
  		/*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
 -- 
-2.21.0
+2.20.1
 

0006-block-add-no_part_scan-module-parameter.patch

@@ -1,4 +1,4 @@
-From 56ce69a0260413418c2845182aa93165c4a1ce42 Mon Sep 17 00:00:00 2001
+From 930e585806ebfd0d08a2d738d7c2110ee85a613a Mon Sep 17 00:00:00 2001
 From: Rusty Bird <[email protected]>
 Date: Mon, 11 Jul 2016 13:05:38 +0000
 Subject: [PATCH] block: add no_part_scan module parameter
@@ -15,7 +15,7 @@ the /sys/module/block/parameters/no_part_scan file.
  1 file changed, 12 insertions(+)
 
 diff --git a/block/genhd.c b/block/genhd.c
-index 26b31fcae217..75993c12e123 100644
+index ff6268970ddc..af13902b0832 100644
 --- a/block/genhd.c
 +++ b/block/genhd.c
 @@ -676,6 +676,15 @@ static void register_disk(struct device *parent, struct gendisk *disk,
@@ -45,5 +45,5 @@ index 26b31fcae217..75993c12e123 100644
  	 * be accompanied with EXT_DEVT flag.  Make sure all
  	 * parameters make sense.
 -- 
-2.21.0
+2.20.1
 

0007-xen-Add-RING_COPY_RESPONSE.patch

@@ -1,4 +1,4 @@
-From 76c089d06f5ff8dc7a54c3e5ef7d2f1447ca8ec4 Mon Sep 17 00:00:00 2001
+From 6812cd3fa24586c1dea1288f6effb7de29dd38d7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Tue, 15 Dec 2015 21:35:14 +0100
@@ -29,10 +29,10 @@ Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
  1 file changed, 14 insertions(+)
 
 diff --git a/include/xen/interface/io/ring.h b/include/xen/interface/io/ring.h
-index 3f40501fc60b..03702f6874df 100644
+index 2af7a1cd6658..0077455452e9 100644
 --- a/include/xen/interface/io/ring.h
 +++ b/include/xen/interface/io/ring.h
-@@ -201,6 +201,20 @@ struct __name##_back_ring {						\
+@@ -190,6 +190,20 @@ struct __name##_back_ring {						\
  #define RING_GET_RESPONSE(_r, _idx)					\
      (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].rsp))
 
@@ -54,5 +54,5 @@ index 3f40501fc60b..03702f6874df 100644
  #define RING_REQUEST_CONS_OVERFLOW(_r, _cons)				\
      (((_cons) - (_r)->rsp_prod_pvt) >= RING_SIZE(_r))
 -- 
-2.21.0
+2.20.1
 

0008-xen-netfront-copy-response-out-of-shared-buffer-befo.patch

@@ -1,4 +1,4 @@
-From 688769df7c2365ae836eb755ccf5b196b45cbd56 Mon Sep 17 00:00:00 2001
+From ba8e6a6980394b54f0419231301351ae63dd1870 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Wed, 16 Dec 2015 05:09:55 +0100
@@ -173,5 +173,5 @@ index 8f0a790ec5e7..abb9b3cd87b8 100644
 
  		err = xennet_get_responses(queue, &rinfo, rp, &tmpq);
 -- 
-2.21.0
+2.20.1
 

0009-xen-netfront-do-not-use-data-already-exposed-to-back.patch

@@ -1,4 +1,4 @@
-From f2452d28602c2de1d69d5ca2e34e6771374414a1 Mon Sep 17 00:00:00 2001
+From 5e63ab0046f0d5df3e074b39c85609ababf440af Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Wed, 16 Dec 2015 05:19:37 +0100
@@ -60,5 +60,5 @@ index abb9b3cd87b8..56c8a4a32672 100644
  	if (skb->ip_summed == CHECKSUM_PARTIAL)
  		/* local packet? */
 -- 
-2.21.0
+2.20.1
 

0010-xen-netfront-add-range-check-for-Tx-response-id.patch

@@ -1,4 +1,4 @@
-From b5bc80763b7bf0f9e32a9a4d4f930ff50d02385d Mon Sep 17 00:00:00 2001
+From c35b15d00c89357d529ca300a4731ac6dcb662c9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Wed, 16 Dec 2015 05:22:24 +0100
@@ -31,5 +31,5 @@ index 56c8a4a32672..e11df925c0dc 100644
  			if (unlikely(gnttab_query_foreign_access(
  				queue->grant_tx_ref[id]) != 0)) {
 -- 
-2.21.0
+2.20.1
 

0011-xen-blkfront-make-local-copy-of-response-before-usin.patch

@@ -1,4 +1,4 @@
-From def16082c5e64f97d5d138ae638a6cde7a136432 Mon Sep 17 00:00:00 2001
+From 213fb4c795cafae3f91c44f6246c3526aa1ed324 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Wed, 16 Dec 2015 05:51:10 +0100
@@ -20,10 +20,10 @@ Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
  1 file changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index db7d28ac9747..3f6dbaf0265b 100644
+index 4131689b314e..344a4025d53b 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -1551,7 +1551,7 @@ static bool blkif_completion(unsigned long *id,
+@@ -1548,7 +1548,7 @@ static bool blkif_completion(unsigned long *id,
  static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  {
  	struct request *req;
@@ -32,7 +32,7 @@ index db7d28ac9747..3f6dbaf0265b 100644
  	RING_IDX i, rp;
  	unsigned long flags;
  	struct blkfront_ring_info *rinfo = (struct blkfront_ring_info *)dev_id;
-@@ -1568,8 +1568,8 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1565,8 +1565,8 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  	for (i = rinfo->ring.rsp_cons; i != rp; i++) {
  		unsigned long id;
 
@@ -43,7 +43,7 @@ index db7d28ac9747..3f6dbaf0265b 100644
  		/*
  		 * The backend has messed up and given us an id that we would
  		 * never have given to it (we stamp it up to BLK_RING_SIZE -
-@@ -1577,39 +1577,39 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1574,39 +1574,39 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  		 */
  		if (id >= BLK_RING_SIZE(info)) {
  			WARN(1, "%s: response to %s has incorrect id (%ld)\n",
@@ -91,7 +91,7 @@ index db7d28ac9747..3f6dbaf0265b 100644
  				blkif_req(req)->error = BLK_STS_NOTSUPP;
  				info->feature_discard = 0;
  				info->feature_secdiscard = 0;
-@@ -1619,15 +1619,15 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1616,15 +1616,15 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  			break;
  		case BLKIF_OP_FLUSH_DISKCACHE:
  		case BLKIF_OP_WRITE_BARRIER:
@@ -111,7 +111,7 @@ index db7d28ac9747..3f6dbaf0265b 100644
  				blkif_req(req)->error = BLK_STS_NOTSUPP;
  			}
  			if (unlikely(blkif_req(req)->error)) {
-@@ -1640,9 +1640,9 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1637,9 +1637,9 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  			/* fall through */
  		case BLKIF_OP_READ:
  		case BLKIF_OP_WRITE:
@@ -124,5 +124,5 @@ index db7d28ac9747..3f6dbaf0265b 100644
  			break;
  		default:
 -- 
-2.21.0
+2.20.1
 

0012-xen-blkfront-prepare-request-locally-only-then-put-i.patch

@@ -1,4 +1,4 @@
-From 115094605c08f2e2790f6110f7fdc002122e0788 Mon Sep 17 00:00:00 2001
+From 29b278e10715f987f0ddc31d87d752d011c6bf66 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <[email protected]>
 Date: Wed, 16 Dec 2015 06:07:14 +0100
@@ -22,10 +22,10 @@ Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
  1 file changed, 44 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index 3f6dbaf0265b..37235ab63ca9 100644
+index 344a4025d53b..c4cd7c7bfdbc 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -527,19 +527,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -524,19 +524,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
 
  static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
  					    struct request *req,
@@ -47,7 +47,7 @@ index 3f6dbaf0265b..37235ab63ca9 100644
 
  	return id;
  }
-@@ -547,23 +544,28 @@ static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
+@@ -544,23 +541,28 @@ static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
  static int blkif_queue_discard_req(struct request *req, struct blkfront_ring_info *rinfo)
  {
  	struct blkfront_info *info = rinfo->dev_info;
@@ -84,7 +84,7 @@ index 3f6dbaf0265b..37235ab63ca9 100644
 
  	return 0;
  }
-@@ -695,7 +697,7 @@ static void blkif_setup_extra_req(struct blkif_request *first,
+@@ -692,7 +694,7 @@ static void blkif_setup_extra_req(struct blkif_request *first,
  static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *rinfo)
  {
  	struct blkfront_info *info = rinfo->dev_info;
@@ -93,7 +93,7 @@ index 3f6dbaf0265b..37235ab63ca9 100644
  	unsigned long id, extra_id = NO_ASSOCIATED_ID;
  	bool require_extra_req = false;
  	int i;
-@@ -760,16 +762,16 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -757,16 +759,16 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  		 * BLKIF_OP_WRITE
  		 */
  		BUG_ON(req_op(req) == REQ_OP_FLUSH || req->cmd_flags & REQ_FUA);
@@ -118,7 +118,7 @@ index 3f6dbaf0265b..37235ab63ca9 100644
  			BLKIF_OP_WRITE : BLKIF_OP_READ;
  		if (req_op(req) == REQ_OP_FLUSH || req->cmd_flags & REQ_FUA) {
  			/*
-@@ -780,15 +782,15 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -777,15 +779,15 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  			 * since it is guaranteed ordered WRT previous writes.)
  			 */
  			if (info->feature_flush && info->feature_fua)
@@ -138,7 +138,7 @@ index 3f6dbaf0265b..37235ab63ca9 100644
  		if (unlikely(require_extra_req)) {
  			extra_id = blkif_ring_get_request(rinfo, req,
  							  &extra_ring_req);
-@@ -798,7 +800,7 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -795,7 +797,7 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  			 */
  			rinfo->shadow[extra_id].num_sg = 0;
 
@@ -147,7 +147,7 @@ index 3f6dbaf0265b..37235ab63ca9 100644
 
  			/* Link the 2 requests together */
  			rinfo->shadow[extra_id].associated_id = id;
-@@ -806,12 +808,12 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -803,12 +805,12 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  		}
  	}
 
@@ -162,7 +162,7 @@ index 3f6dbaf0265b..37235ab63ca9 100644
 
  	for_each_sg(rinfo->shadow[id].sg, sg, num_sg, i) {
  		BUG_ON(sg->offset + sg->length > PAGE_SIZE);
-@@ -833,10 +835,20 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -830,10 +832,20 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  	if (setup.segments)
  		kunmap_atomic(setup.segments);
 
@@ -187,5 +187,5 @@ index 3f6dbaf0265b..37235ab63ca9 100644
  	if (new_persistent_gnts)
  		gnttab_free_grant_references(setup.gref_head);
 -- 
-2.21.0
+2.20.1
 

0013-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch

@@ -1,4 +1,4 @@
-From 6a9f5a2435d3845b41f32b3768bb1c25bba1be2d Mon Sep 17 00:00:00 2001
+From 427fb129811a52154a999a04d31498379ecc3a24 Mon Sep 17 00:00:00 2001
 From: Konrad Rzeszutek Wilk <[email protected]>
 Date: Wed, 1 Apr 2015 17:01:26 -0400
 Subject: [PATCH] xen/pcifront/pciback: Update pciif.h with ->err and ->result
@@ -71,5 +71,5 @@ index d9922ae36eb5..c8b674fd2455 100644
  	/* IN: Contains extra infor for this operation */
  	uint32_t info;
 -- 
-2.21.0
+2.20.1