Skip to content

Commit

Permalink
Update patches, drop those already included upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
marmarek committed Nov 27, 2021
1 parent 0d4563e commit a0264ae
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 691 deletions.
57 changes: 0 additions & 57 deletions 0001-xen-balloon-add-late_initcall_sync-for-initial-ballo.patch

This file was deleted.

6 changes: 3 additions & 3 deletions 0001-xen-netfront-detach-crash.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ index 482c6c8b0fb7..8f0a790ec5e7 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1138,9 +1138,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)

skb = queue->tx_skbs[i].skb;
skb = queue->tx_skbs[i];
queue->tx_skbs[i] = NULL;
get_page(queue->grant_tx_page[i]);
- gnttab_end_foreign_access(queue->grant_tx_ref[i],
- GNTMAP_readonly,
Expand All @@ -32,7 +32,7 @@ index 482c6c8b0fb7..8f0a790ec5e7 100644
+ &queue->gref_tx_head, queue->grant_tx_ref[i]);
queue->grant_tx_page[i] = NULL;
queue->grant_tx_ref[i] = GRANT_INVALID_REF;
add_id_to_freelist(&queue->tx_skb_freelist, queue->tx_skbs, i);
add_id_to_list(&queue->tx_skb_freelist, queue->tx_link, i);
--
2.25.4

8 changes: 4 additions & 4 deletions 0006-block-add-no_part_scan-module-parameter.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ index 06b642b23a07..15769cadd687 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -784,6 +784,15 @@ static void register_disk(struct device *parent, struct gendisk *disk,
}
blkdev_put(bdev, FMODE_READ);
}

+/* copied (not moved) from far down below, to have fewer patch hunks */
Expand All @@ -32,11 +32,11 @@ index 06b642b23a07..15769cadd687 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 disk information to kernel list
* device_add_disk - add disk information to kernel list
* @parent: parent device for the disk
@@ -812,6 +821,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
if (register_queue)
elevator_init_mq(disk->queue);
*/
elevator_init_mq(disk->queue);

+ if (disk_no_part_scan)
+ disk->flags |= GENHD_FL_NO_PART_SCAN;
Expand Down
203 changes: 0 additions & 203 deletions 0008-xen-netfront-copy-response-out-of-shared-buffer-befo.patch

This file was deleted.

64 changes: 0 additions & 64 deletions 0009-xen-netfront-do-not-use-data-already-exposed-to-back.patch

This file was deleted.

Loading

0 comments on commit a0264ae

Please sign in to comment.