From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 9 Mar 2022 11:49:06 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v4.9.306~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9bdef5fa9e06298ba8d62597a64a5baeca00af4;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	block-drop-unused-includes-in-linux-genhd.h.patch
	slip-fix-macro-redefine-warning.patch
---

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
new file mode 100644
index 00000000000..030bdf576fc
--- /dev/null
+++ b/queue-5.15/block-drop-unused-includes-in-linux-genhd.h.patch
@@ -0,0 +1,230 @@
+From b81e0c2372e65e5627864ba034433b64b2fc73f5 Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Mon, 20 Sep 2021 14:33:25 +0200
+Subject: block: drop unused includes in <linux/genhd.h>
+
+From: Christoph Hellwig <hch@lst.de>
+
+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 <hch@lst.de>
+Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
+Link: https://lore.kernel.org/r/20210920123328.1399408-15-hch@lst.de
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Cc: Guenter Roeck <linux@roeck-us.net>
+[ needed to fix a MIPS build issue in 5.15.y - gregkh ]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 <linux/blk-mq.h>
+ #include <linux/ata.h>
+ #include <linux/hdreg.h>
++#include <linux/major.h>
+ #include <linux/cdrom.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+--- a/block/genhd.c
++++ b/block/genhd.c
+@@ -19,6 +19,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/slab.h>
+ #include <linux/kmod.h>
++#include <linux/major.h>
+ #include <linux/mutex.h>
+ #include <linux/idr.h>
+ #include <linux/log2.h>
+--- a/block/holder.c
++++ b/block/holder.c
+@@ -1,5 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0-only
+ #include <linux/genhd.h>
++#include <linux/slab.h>
+ 
+ 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 <linux/fs.h>
++#include <linux/major.h>
+ #include <linux/slab.h>
+ #include <linux/ctype.h>
+ #include <linux/genhd.h>
+--- a/drivers/block/amiflop.c
++++ b/drivers/block/amiflop.c
+@@ -61,6 +61,7 @@
+ #include <linux/hdreg.h>
+ #include <linux/delay.h>
+ #include <linux/init.h>
++#include <linux/major.h>
+ #include <linux/mutex.h>
+ #include <linux/fs.h>
+ #include <linux/blk-mq.h>
+--- a/drivers/block/ataflop.c
++++ b/drivers/block/ataflop.c
+@@ -68,6 +68,7 @@
+ #include <linux/delay.h>
+ #include <linux/init.h>
+ #include <linux/blk-mq.h>
++#include <linux/major.h>
+ #include <linux/mutex.h>
+ #include <linux/completion.h>
+ #include <linux/wait.h>
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -184,6 +184,7 @@ static int print_unex = 1;
+ #include <linux/ioport.h>
+ #include <linux/interrupt.h>
+ #include <linux/init.h>
++#include <linux/major.h>
+ #include <linux/platform_device.h>
+ #include <linux/mod_devicetable.h>
+ #include <linux/mutex.h>
+--- a/drivers/block/swim.c
++++ b/drivers/block/swim.c
+@@ -16,6 +16,7 @@
+ #include <linux/fd.h>
+ #include <linux/slab.h>
+ #include <linux/blk-mq.h>
++#include <linux/major.h>
+ #include <linux/mutex.h>
+ #include <linux/hdreg.h>
+ #include <linux/kernel.h>
+--- a/drivers/block/xen-blkfront.c
++++ b/drivers/block/xen-blkfront.c
+@@ -42,6 +42,7 @@
+ #include <linux/cdrom.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
++#include <linux/major.h>
+ #include <linux/mutex.h>
+ #include <linux/scatterlist.h>
+ #include <linux/bitmap.h>
+--- a/drivers/md/md.c
++++ b/drivers/md/md.c
+@@ -51,6 +51,7 @@
+ #include <linux/hdreg.h>
+ #include <linux/proc_fs.h>
+ #include <linux/random.h>
++#include <linux/major.h>
+ #include <linux/module.h>
+ #include <linux/reboot.h>
+ #include <linux/file.h>
+--- a/drivers/s390/block/dasd_genhd.c
++++ b/drivers/s390/block/dasd_genhd.c
+@@ -14,6 +14,7 @@
+ #define KMSG_COMPONENT "dasd"
+ 
+ #include <linux/interrupt.h>
++#include <linux/major.h>
+ #include <linux/fs.h>
+ #include <linux/blkpg.h>
+ 
+--- a/drivers/scsi/sd.c
++++ b/drivers/scsi/sd.c
+@@ -48,6 +48,7 @@
+ #include <linux/blkpg.h>
+ #include <linux/blk-pm.h>
+ #include <linux/delay.h>
++#include <linux/major.h>
+ #include <linux/mutex.h>
+ #include <linux/string_helpers.h>
+ #include <linux/async.h>
+--- a/drivers/scsi/sg.c
++++ b/drivers/scsi/sg.c
+@@ -31,6 +31,7 @@ static int sg_version_num = 30536;	/* 2
+ #include <linux/errno.h>
+ #include <linux/mtio.h>
+ #include <linux/ioctl.h>
++#include <linux/major.h>
+ #include <linux/slab.h>
+ #include <linux/fcntl.h>
+ #include <linux/init.h>
+--- a/drivers/scsi/sr.c
++++ b/drivers/scsi/sr.c
+@@ -44,6 +44,7 @@
+ #include <linux/cdrom.h>
+ #include <linux/interrupt.h>
+ #include <linux/init.h>
++#include <linux/major.h>
+ #include <linux/blkdev.h>
+ #include <linux/blk-pm.h>
+ #include <linux/mutex.h>
+--- a/drivers/scsi/st.c
++++ b/drivers/scsi/st.c
+@@ -32,6 +32,7 @@ static const char *verstr = "20160209";
+ #include <linux/slab.h>
+ #include <linux/errno.h>
+ #include <linux/mtio.h>
++#include <linux/major.h>
+ #include <linux/cdrom.h>
+ #include <linux/ioctl.h>
+ #include <linux/fcntl.h>
+--- a/include/linux/genhd.h
++++ b/include/linux/genhd.h
+@@ -12,12 +12,10 @@
+ 
+ #include <linux/types.h>
+ #include <linux/kdev_t.h>
+-#include <linux/rcupdate.h>
+-#include <linux/slab.h>
+-#include <linux/percpu-refcount.h>
+ #include <linux/uuid.h>
+ #include <linux/blk_types.h>
+-#include <asm/local.h>
++#include <linux/device.h>
++#include <linux/xarray.h>
+ 
+ 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 <linux/major.h>
+-#include <linux/device.h>
+-#include <linux/smp.h>
+-#include <linux/string.h>
+-#include <linux/fs.h>
+-#include <linux/workqueue.h>
+-#include <linux/xarray.h>
+-
+ #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 <linux/genhd.h>
++#include <asm/local.h>
+ 
+ struct disk_stats {
+ 	u64 nsecs[NR_STAT_GROUPS];
diff --git a/queue-5.15/series b/queue-5.15/series
index 5011cb562fc..6367c1d2aa0 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -39,3 +39,5 @@ 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
diff --git a/queue-5.15/slip-fix-macro-redefine-warning.patch b/queue-5.15/slip-fix-macro-redefine-warning.patch
new file mode 100644
index 00000000000..76e20e2e5cd
--- /dev/null
+++ b/queue-5.15/slip-fix-macro-redefine-warning.patch
@@ -0,0 +1,32 @@
+From e5b40668e930979bd1e82c7ed7c9029db635f0e4 Mon Sep 17 00:00:00 2001
+From: Huang Pei <huangpei@loongson.cn>
+Date: Tue, 23 Nov 2021 19:07:49 +0800
+Subject: slip: fix macro redefine warning
+
+From: Huang Pei <huangpei@loongson.cn>
+
+commit e5b40668e930979bd1e82c7ed7c9029db635f0e4 upstream.
+
+MIPS/IA64 define END as assembly function ending, which conflict
+with END definition in slip.h, just undef it at first
+
+Reported-by: lkp@intel.com
+Signed-off-by: Huang Pei <huangpei@loongson.cn>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/slip/slip.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/slip/slip.h
++++ b/drivers/net/slip/slip.h
+@@ -40,6 +40,8 @@
+ 					   insmod -oslip_maxdev=nnn	*/
+ #define SL_MTU		296		/* 296; I am used to 600- FvK	*/
+ 
++/* some arch define END as assembly function ending, just undef it */
++#undef	END
+ /* SLIP protocol characters. */
+ #define END             0300		/* indicates end of frame	*/
+ #define ESC             0333		/* indicates byte stuffing	*/