-
-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
247 additions
and
524 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From ecfbead1ac09585d0c25fd446fa05d5aff325eb8 Mon Sep 17 00:00:00 2001 | ||
From f6554c0fee601d821e9aabe101c7159d6176b5dd 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.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From c7f548c739168b6d6d484324ed14fb61dc8c82a6 Mon Sep 17 00:00:00 2001 | ||
From 75b3b949f232394e7079ee02916725a6fb03c273 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 2c4f949611e4..d29dd999701d 100644 | ||
index 54165f3569e8..af6340b1e16f 100644 | ||
--- a/arch/x86/kernel/cpu/mce/core.c | ||
+++ b/arch/x86/kernel/cpu/mce/core.c | ||
@@ -51,6 +51,10 @@ | ||
|
@@ -53,7 +53,7 @@ index 2c4f949611e4..d29dd999701d 100644 | |
#include "internal.h" | ||
|
||
/* sysfs synchronization */ | ||
@@ -2515,6 +2519,11 @@ static __init int mcheck_init_device(void) | ||
@@ -2527,6 +2531,11 @@ static __init int mcheck_init_device(void) | ||
free_cpumask_var(mce_device_initialized); | ||
|
||
err_out: | ||
|
@@ -66,5 +66,5 @@ index 2c4f949611e4..d29dd999701d 100644 | |
|
||
return err; | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 79f80cd5ce722e793d4badb5be7343c08491dedb Mon Sep 17 00:00:00 2001 | ||
From b52ecfd2ee13fd99901b6d596bc3f7796c2ac12f 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 499eff7d3f65..edfba6329b47 100644 | ||
index 3a791c8485d0..b75bcebc635b 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 499eff7d3f65..edfba6329b47 100644 | |
} | ||
evtchn = bind_pirq.port; | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a9e41820649a6c8af3ec3c96399f3793f58d0295 Mon Sep 17 00:00:00 2001 | ||
From c7fcd9707db89f169135298bf0351d4931ee2b1f 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 b32877e0b384..0919a86b867e 100644 | ||
index 3b889ea950c2..59f57e55a36b 100644 | ||
--- a/drivers/block/xen-blkfront.c | ||
+++ b/drivers/block/xen-blkfront.c | ||
@@ -2348,6 +2348,7 @@ static void blkfront_connect(struct blkfront_info *info) | ||
char *envp[] = { "RESIZE=1", NULL }; | ||
@@ -2347,6 +2347,7 @@ static void blkfront_connect(struct blkfront_info *info) | ||
unsigned int binfo; | ||
int err, i; | ||
struct blkfront_ring_info *rinfo; | ||
+ int removable; | ||
|
||
switch (info->connected) { | ||
case BLKIF_STATE_CONNECTED: | ||
@@ -2415,6 +2416,12 @@ static void blkfront_connect(struct blkfront_info *info) | ||
@@ -2411,6 +2412,12 @@ static void blkfront_connect(struct blkfront_info *info) | ||
} | ||
} | ||
|
||
|
@@ -35,5 +35,5 @@ index b32877e0b384..0919a86b867e 100644 | |
physical_sector_size); | ||
if (err) { | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From b13ab0ad0fbc01779413b61d8cac6f497a4755ee Mon Sep 17 00:00:00 2001 | ||
From e00e016602e2f27b68a09bc07454f9d425ca461e 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 0919a86b867e..f789ea26a958 100644 | ||
index 59f57e55a36b..1052b95bc9a9 100644 | ||
--- a/drivers/block/xen-blkfront.c | ||
+++ b/drivers/block/xen-blkfront.c | ||
@@ -47,6 +47,7 @@ | ||
|
@@ -30,5 +30,5 @@ index 0919a86b867e..f789ea26a958 100644 | |
default: | ||
/*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n", | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 3abbe7c3fe848b982243bfa9319566e42465ee3c Mon Sep 17 00:00:00 2001 | ||
From afe073973e6e402938790ca3b1b37d24422d36ba 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,10 +15,10 @@ 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 9c2e13ce0d19..59141a6f1bfe 100644 | ||
index 06b642b23a07..15769cadd687 100644 | ||
--- a/block/genhd.c | ||
+++ b/block/genhd.c | ||
@@ -712,6 +712,15 @@ static void register_disk(struct device *parent, struct gendisk *disk, | ||
@@ -784,6 +784,15 @@ static void register_disk(struct device *parent, struct gendisk *disk, | ||
} | ||
} | ||
|
||
|
@@ -34,7 +34,7 @@ index 9c2e13ce0d19..59141a6f1bfe 100644 | |
/** | ||
* __device_add_disk - add disk information to kernel list | ||
* @parent: parent device for the disk | ||
@@ -740,6 +749,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, | ||
@@ -812,6 +821,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, | ||
if (register_queue) | ||
elevator_init_mq(disk->queue); | ||
|
||
|
@@ -45,5 +45,5 @@ index 9c2e13ce0d19..59141a6f1bfe 100644 | |
* be accompanied with EXT_DEVT flag. Make sure all | ||
* parameters make sense. | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a5f12aa1ae2c20c83ef5e23babcaa588c316f8a2 Mon Sep 17 00:00:00 2001 | ||
From e213da4a10dfecb30dd9f677ef3b410858eba458 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 | ||
|
@@ -54,5 +54,5 @@ index 2af7a1cd6658..0077455452e9 100644 | |
#define RING_REQUEST_CONS_OVERFLOW(_r, _cons) \ | ||
(((_cons) - (_r)->rsp_prod_pvt) >= RING_SIZE(_r)) | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 53b7988fd51946c9b9d4d6ce0b7c5ba05710ae26 Mon Sep 17 00:00:00 2001 | ||
From 208d5b6749fd378f88cf29b437bed56a2a193558 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.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 5d7acb7f9662658304d9f8fb4700032c9547a82e Mon Sep 17 00:00:00 2001 | ||
From c54a7e94c045efe8f0ddda410fc00049a11d5f34 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.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 65b3d6a11740b22bb5b17c506109c06c89cd788a Mon Sep 17 00:00:00 2001 | ||
From e300ecb886bfb5ee571d28eb06a679a87d8845e9 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.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 9bbf107e375aac43ca86bbe831f5b699d40cf153 Mon Sep 17 00:00:00 2001 | ||
From cf4f8d62af083a8006a5e437fe02ea27628aa613 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,7 +20,7 @@ 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 f789ea26a958..a1a1827f8cdb 100644 | ||
index 1052b95bc9a9..60e4c6f36ba3 100644 | ||
--- a/drivers/block/xen-blkfront.c | ||
+++ b/drivers/block/xen-blkfront.c | ||
@@ -1561,7 +1561,7 @@ static bool blkif_completion(unsigned long *id, | ||
|
@@ -124,5 +124,5 @@ index f789ea26a958..a1a1827f8cdb 100644 | |
break; | ||
default: | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 7b398eaaa5110c29495e705be7f02b4b0b0ed412 Mon Sep 17 00:00:00 2001 | ||
From 5437e2aca7e2afdbd502075382833fca2d01ec57 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,7 +22,7 @@ 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 a1a1827f8cdb..0b405b248f20 100644 | ||
index 60e4c6f36ba3..3a5f111fd5e8 100644 | ||
--- a/drivers/block/xen-blkfront.c | ||
+++ b/drivers/block/xen-blkfront.c | ||
@@ -538,19 +538,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode, | ||
|
@@ -187,5 +187,5 @@ index a1a1827f8cdb..0b405b248f20 100644 | |
if (new_persistent_gnts) | ||
gnttab_free_grant_references(setup.gref_head); | ||
-- | ||
2.25.3 | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8d6c1fb81db887a6a26e61645e7bedc69dfde0b8 Mon Sep 17 00:00:00 2001 | ||
From 09e8c8c31b70ee92c712adf756418d27c73cafea 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.25.3 | ||
2.25.4 | ||
|
81 changes: 0 additions & 81 deletions
81
0014-xen-events-avoid-NULL-pointer-dereference-in-evtchn_.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.