From: Greg Kroah-Hartman Date: Thu, 10 Mar 2022 13:43:55 +0000 (+0100) Subject: drop queue-5.15/block-drop-unused-includes-in-linux-genhd.h.patch for now X-Git-Tag: v4.9.306~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dd29f130f816d51867d8a507daaf7c8a3206b2d;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/block-drop-unused-includes-in-linux-genhd.h.patch for now --- diff --git a/queue-5.15/block-drop-unused-includes-in-linux-genhd.h.patch b/queue-5.15/block-drop-unused-includes-in-linux-genhd.h.patch deleted file mode 100644 index 030bdf576fc..00000000000 --- a/queue-5.15/block-drop-unused-includes-in-linux-genhd.h.patch +++ /dev/null @@ -1,230 +0,0 @@ -From b81e0c2372e65e5627864ba034433b64b2fc73f5 Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig -Date: Mon, 20 Sep 2021 14:33:25 +0200 -Subject: block: drop unused includes in - -From: Christoph Hellwig - -commit b81e0c2372e65e5627864ba034433b64b2fc73f5 upstream. - -Drop various include not actually used in genhd.h itself, and -move the remaning includes closer together. - -Signed-off-by: Christoph Hellwig -Reviewed-by: Johannes Thumshirn -Link: https://lore.kernel.org/r/20210920123328.1399408-15-hch@lst.de -Signed-off-by: Jens Axboe -Cc: Guenter Roeck -[ needed to fix a MIPS build issue in 5.15.y - gregkh ] -Signed-off-by: Greg Kroah-Hartman ---- - arch/um/drivers/ubd_kern.c | 1 + - block/genhd.c | 1 + - block/holder.c | 1 + - block/partitions/core.c | 1 + - drivers/block/amiflop.c | 1 + - drivers/block/ataflop.c | 1 + - drivers/block/floppy.c | 1 + - drivers/block/swim.c | 1 + - drivers/block/xen-blkfront.c | 1 + - drivers/md/md.c | 1 + - drivers/s390/block/dasd_genhd.c | 1 + - drivers/scsi/sd.c | 1 + - drivers/scsi/sg.c | 1 + - drivers/scsi/sr.c | 1 + - drivers/scsi/st.c | 1 + - include/linux/genhd.h | 14 ++------------ - include/linux/part_stat.h | 1 + - 17 files changed, 18 insertions(+), 12 deletions(-) - ---- a/arch/um/drivers/ubd_kern.c -+++ b/arch/um/drivers/ubd_kern.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/block/genhd.c -+++ b/block/genhd.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/block/holder.c -+++ b/block/holder.c -@@ -1,5 +1,6 @@ - // SPDX-License-Identifier: GPL-2.0-only - #include -+#include - - struct bd_holder_disk { - struct list_head list; ---- a/block/partitions/core.c -+++ b/block/partitions/core.c -@@ -5,6 +5,7 @@ - * Copyright (C) 2020 Christoph Hellwig - */ - #include -+#include - #include - #include - #include ---- a/drivers/block/amiflop.c -+++ b/drivers/block/amiflop.c -@@ -61,6 +61,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/block/ataflop.c -+++ b/drivers/block/ataflop.c -@@ -68,6 +68,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/block/floppy.c -+++ b/drivers/block/floppy.c -@@ -184,6 +184,7 @@ static int print_unex = 1; - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/block/swim.c -+++ b/drivers/block/swim.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/block/xen-blkfront.c -+++ b/drivers/block/xen-blkfront.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -51,6 +51,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/s390/block/dasd_genhd.c -+++ b/drivers/s390/block/dasd_genhd.c -@@ -14,6 +14,7 @@ - #define KMSG_COMPONENT "dasd" - - #include -+#include - #include - #include - ---- a/drivers/scsi/sd.c -+++ b/drivers/scsi/sd.c -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/scsi/sg.c -+++ b/drivers/scsi/sg.c -@@ -31,6 +31,7 @@ static int sg_version_num = 30536; /* 2 - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/scsi/sr.c -+++ b/drivers/scsi/sr.c -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/drivers/scsi/st.c -+++ b/drivers/scsi/st.c -@@ -32,6 +32,7 @@ static const char *verstr = "20160209"; - #include - #include - #include -+#include - #include - #include - #include ---- a/include/linux/genhd.h -+++ b/include/linux/genhd.h -@@ -12,12 +12,10 @@ - - #include - #include --#include --#include --#include - #include - #include --#include -+#include -+#include - - extern const struct device_type disk_type; - extern struct device_type part_type; -@@ -26,14 +24,6 @@ extern struct class block_class; - #define DISK_MAX_PARTS 256 - #define DISK_NAME_LEN 32 - --#include --#include --#include --#include --#include --#include --#include -- - #define PARTITION_META_INFO_VOLNAMELTH 64 - /* - * Enough for the string representation of any kind of UUID plus NULL. ---- a/include/linux/part_stat.h -+++ b/include/linux/part_stat.h -@@ -3,6 +3,7 @@ - #define _LINUX_PART_STAT_H - - #include -+#include - - struct disk_stats { - u64 nsecs[NR_STAT_GROUPS]; diff --git a/queue-5.15/series b/queue-5.15/series index 2175d6fedbd..24472eb6c48 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,3 +1,4 @@ +slip-fix-macro-redefine-warning.patch x86-bugs-unconditionally-allow-spectre_v2-retpoline-amd.patch x86-speculation-rename-retpoline_amd-to-retpoline_lfence.patch x86-speculation-add-eibrs-retpoline-options.patch @@ -39,8 +40,6 @@ kvm-arm64-allow-smccc_arch_workaround_3-to-be-discovered-and-migrated.patch arm64-use-the-clearbhb-instruction-in-mitigations.patch arm64-proton-pack-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch arm-fix-build-error-when-bpf_syscall-is-disabled.patch -slip-fix-macro-redefine-warning.patch -block-drop-unused-includes-in-linux-genhd.h.patch arm-fix-co-processor-register-typo.patch arm-do-not-use-nocrossrefs-directive-with-ld.lld.patch arm64-do-not-include-__read_once-block-in-assembly-files.patch diff --git a/queue-5.15/xen-blkfront-don-t-use-gnttab_query_foreign_access-for-mapped-status.patch b/queue-5.15/xen-blkfront-don-t-use-gnttab_query_foreign_access-for-mapped-status.patch index 2bea43c1736..a2c3484d992 100644 --- a/queue-5.15/xen-blkfront-don-t-use-gnttab_query_foreign_access-for-mapped-status.patch +++ b/queue-5.15/xen-blkfront-don-t-use-gnttab_query_foreign_access-for-mapped-status.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c -@@ -1291,7 +1291,8 @@ free_shadow: +@@ -1290,7 +1290,8 @@ free_shadow: rinfo->ring_ref[i] = GRANT_INVALID_REF; } } @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman rinfo->ring.sring = NULL; if (rinfo->irq) -@@ -1375,9 +1376,15 @@ static int blkif_get_final_status(enum b +@@ -1374,9 +1375,15 @@ static int blkif_get_final_status(enum b return BLKIF_RSP_OKAY; } @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman { int i = 0; struct scatterlist *sg; -@@ -1400,7 +1407,7 @@ static bool blkif_completion(unsigned lo +@@ -1399,7 +1406,7 @@ static bool blkif_completion(unsigned lo /* Wait the second response if not yet here. */ if (s2->status < REQ_DONE) @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman bret->status = blkif_get_final_status(s->status, s2->status); -@@ -1451,42 +1458,43 @@ static bool blkif_completion(unsigned lo +@@ -1450,42 +1457,43 @@ static bool blkif_completion(unsigned lo } /* Add the persistent grant into the list of free grants */ for (i = 0; i < num_grant; i++) { @@ -129,7 +129,7 @@ Signed-off-by: Greg Kroah-Hartman /* * Add the used indirect page back to the list of * available pages for indirect grefs. -@@ -1501,7 +1509,7 @@ static bool blkif_completion(unsigned lo +@@ -1500,7 +1508,7 @@ static bool blkif_completion(unsigned lo } } @@ -138,7 +138,7 @@ Signed-off-by: Greg Kroah-Hartman } static irqreturn_t blkif_interrupt(int irq, void *dev_id) -@@ -1567,12 +1575,17 @@ static irqreturn_t blkif_interrupt(int i +@@ -1566,12 +1574,17 @@ static irqreturn_t blkif_interrupt(int i } if (bret.operation != BLKIF_OP_DISCARD) { @@ -157,7 +157,7 @@ Signed-off-by: Greg Kroah-Hartman } if (add_id_to_freelist(rinfo, id)) { -@@ -1679,8 +1692,7 @@ static int setup_blkring(struct xenbus_d +@@ -1678,8 +1691,7 @@ static int setup_blkring(struct xenbus_d for (i = 0; i < info->nr_ring_pages; i++) rinfo->ring_ref[i] = GRANT_INVALID_REF; @@ -167,7 +167,7 @@ Signed-off-by: Greg Kroah-Hartman if (!sring) { xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); return -ENOMEM; -@@ -1690,7 +1702,7 @@ static int setup_blkring(struct xenbus_d +@@ -1689,7 +1701,7 @@ static int setup_blkring(struct xenbus_d err = xenbus_grant_ring(dev, rinfo->ring.sring, info->nr_ring_pages, gref); if (err < 0) { @@ -176,7 +176,7 @@ Signed-off-by: Greg Kroah-Hartman rinfo->ring.sring = NULL; goto fail; } -@@ -2530,11 +2542,10 @@ static void purge_persistent_grants(stru +@@ -2529,11 +2541,10 @@ static void purge_persistent_grants(stru list_for_each_entry_safe(gnt_list_entry, tmp, &rinfo->grants, node) { if (gnt_list_entry->gref == GRANT_INVALID_REF ||