drop applied patches

12 files changed, 35 insertions, 246 deletions

diff --git a/0001-PCI-ACPI-do-not-reference-a-pci-device-after-it-has-.patch b/0001-PCI-ACPI-do-not-reference-a-pci-device-after-it-has-.patch
deleted file mode 100644
index 336f2fe923977d..00000000000000
--- a/0001-PCI-ACPI-do-not-reference-a-pci-device-after-it-has-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 979409d043158380b77704b8cbec889ad674b613 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Thu, 28 Apr 2022 16:25:56 +0200
-Subject: [PATCH 1/2] PCI/ACPI: do not reference a pci device after it has been
- released
-
-In acpi_get_pci_dev(), the debugging message for when a PCI bridge is
-not found uses a pointer to a pci device whose reference has just been
-dropped.  The chance that this really is a device that is now been
-removed from the system is almost impossible to happen, but to be safe,
-let's print out the debugging message based on the acpi root device
-which we do have a valid reference to at the moment.
-
-Cc: Bjorn Helgaas <bhelgaas@google.com>
-Cc: "Rafael J. Wysocki" <rafael@kernel.org>
-Cc: Len Brown <lenb@kernel.org>
-Cc: linux-pci@vger.kernel.org
-Cc: linux-acpi@vger.kernel.org
-Reported-by: whitehat002 <hackyzh002@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/acpi/pci_root.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/acpi/pci_root.c
-+++ b/drivers/acpi/pci_root.c
-@@ -372,7 +372,8 @@ struct pci_dev *acpi_get_pci_dev(acpi_ha
- 		 * case pdev->subordinate will be NULL for the parent.
- 		 */
- 		if (!pbus) {
--			dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n");
-+			dev_dbg(&root->device->dev,
-+				"dev %d, function %d is not a PCI-to-PCI bridge\n", dev, fn);
- 			pdev = NULL;
- 			break;
- 		}
diff --git a/0001-lib-vdso-use-grep-E-instead-of-egrep.patch b/0001-lib-vdso-use-grep-E-instead-of-egrep.patch
deleted file mode 100644
index 613fbf9764014d..00000000000000
--- a/0001-lib-vdso-use-grep-E-instead-of-egrep.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From de1878a9305dbbfd895f4f73f05da04e56713a4a Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Tue, 20 Sep 2022 19:03:40 +0200
-Subject: [PATCH 1/3] lib/vdso: use "grep -E" instead of "egrep"
-
-The latest version of grep claims the egrep is now obsolete so the build
-now contains warnings that look like:
-	egrep: warning: egrep is obsolescent; using grep -E
-fix this up by moving the vdso Makefile to use "grep -E" instead.
-
-Cc: Andy Lutomirski <luto@kernel.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/vdso/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/vdso/Makefile
-+++ b/lib/vdso/Makefile
-@@ -17,6 +17,6 @@ $(error ARCH_REL_TYPE_ABS is not set)
- endif
- 
- quiet_cmd_vdso_check = VDSOCHK $@
--      cmd_vdso_check = if $(OBJDUMP) -R $@ | egrep -h "$(ARCH_REL_TYPE_ABS)"; \
-+      cmd_vdso_check = if $(OBJDUMP) -R $@ | grep -E -h "$(ARCH_REL_TYPE_ABS)"; \
- 		       then (echo >&2 "$@: dynamic relocations are not supported"; \
- 			     rm -f $@; /bin/false); fi
diff --git a/0001-readfile-implement-readfile-syscall.patch b/0001-readfile-implement-readfile-syscall.patch
index 4c9d2d706667f1..84effce170dcd7 100644
--- a/0001-readfile-implement-readfile-syscall.patch
+++ b/0001-readfile-implement-readfile-syscall.patch
@@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -1528,3 +1528,53 @@ int stream_open(struct inode *inode, str
+@@ -1525,3 +1525,53 @@ int stream_open(struct inode *inode, str
  }
  
  EXPORT_SYMBOL(stream_open);
diff --git a/0001-scsi-stex-properly-zero-out-the-passthrough-command-.patch b/0001-scsi-stex-properly-zero-out-the-passthrough-command-.patch
deleted file mode 100644
index dcf8218088fb3d..00000000000000
--- a/0001-scsi-stex-properly-zero-out-the-passthrough-command-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 8105ed43507cb6a7ef4df7b059bc721a7fd4ca2d Mon Sep 17 00:00:00 2001
-From: Linus Torvalds <torvalds@linux-foundation.org>
-Date: Fri, 9 Sep 2022 08:50:30 +0200
-Subject: [PATCH] scsi: stex: properly zero out the passthrough command
- structure
-
-The passthrough structure is declared off of the stack, so it needs to
-be set to zero before copied back to userspace to prevent any
-unintentional data leakage.  Switch things to be statically allocated
-which will fill the unused fields with 0 automatically.
-
-Reported-by: hdthky <hdthky0@gmail.com>
-Cc: stable <stable@kernel.org>
-Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
-Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
-Cc: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/scsi/stex.c      |   17 +++++++++--------
- include/scsi/scsi_cmnd.h |    2 +-
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
---- a/drivers/scsi/stex.c
-+++ b/drivers/scsi/stex.c
-@@ -665,16 +665,17 @@ static int stex_queuecommand_lck(struct
- 		return 0;
- 	case PASSTHRU_CMD:
- 		if (cmd->cmnd[1] == PASSTHRU_GET_DRVVER) {
--			struct st_drvver ver;
-+			const struct st_drvver ver = {
-+				.major = ST_VER_MAJOR,
-+				.minor = ST_VER_MINOR,
-+				.oem = ST_OEM,
-+				.build = ST_BUILD_VER,
-+				.signature[0] = PASSTHRU_SIGNATURE,
-+				.console_id = host->max_id - 1,
-+				.host_no = hba->host->host_no,
-+			};
- 			size_t cp_len = sizeof(ver);
- 
--			ver.major = ST_VER_MAJOR;
--			ver.minor = ST_VER_MINOR;
--			ver.oem = ST_OEM;
--			ver.build = ST_BUILD_VER;
--			ver.signature[0] = PASSTHRU_SIGNATURE;
--			ver.console_id = host->max_id - 1;
--			ver.host_no = hba->host->host_no;
- 			cp_len = scsi_sg_copy_from_buffer(cmd, &ver, cp_len);
- 			if (sizeof(ver) == cp_len)
- 				cmd->result = DID_OK << 16;
---- a/include/scsi/scsi_cmnd.h
-+++ b/include/scsi/scsi_cmnd.h
-@@ -201,7 +201,7 @@ static inline unsigned int scsi_get_resi
- 	for_each_sg(scsi_sglist(cmd), sg, nseg, __i)
- 
- static inline int scsi_sg_copy_from_buffer(struct scsi_cmnd *cmd,
--					   void *buf, int buflen)
-+					   const void *buf, int buflen)
- {
- 	return sg_copy_from_buffer(scsi_sglist(cmd), scsi_sg_count(cmd),
- 				   buf, buflen);
diff --git a/0001-vsmp-driver.patch b/0001-vsmp-driver.patch
index c34aa26b09e2c0..0c44f9b5ec1388 100644
--- a/0001-vsmp-driver.patch
+++ b/0001-vsmp-driver.patch
@@ -28,7 +28,7 @@ first cut to cleanup
 +Description:    Shows the full version of the vSMP hypervisor
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -21814,6 +21814,12 @@ F:	lib/test_printf.c
+@@ -22328,6 +22328,12 @@ F:	lib/test_printf.c
  F:	lib/test_scanf.c
  F:	lib/vsprintf.c
  
@@ -39,23 +39,23 @@ first cut to cleanup
 +F:	drivers/virt/vsmp
 +
  VT1211 HARDWARE MONITOR DRIVER
- M:	Juerg Haefliger <juergh@gmail.com>
+ M:	Juerg Haefliger <juergh@proton.me>
  L:	linux-hwmon@vger.kernel.org
 --- a/drivers/virt/Kconfig
 +++ b/drivers/virt/Kconfig
-@@ -52,4 +52,6 @@ source "drivers/virt/coco/efi_secret/Kco
+@@ -54,4 +54,6 @@ source "drivers/virt/coco/sev-guest/Kcon
  
- source "drivers/virt/coco/sev-guest/Kconfig"
+ source "drivers/virt/coco/tdx-guest/Kconfig"
  
 +source "drivers/virt/vsmp/Kconfig"
 +
  endif
 --- a/drivers/virt/Makefile
 +++ b/drivers/virt/Makefile
-@@ -11,3 +11,5 @@ obj-$(CONFIG_NITRO_ENCLAVES)	+= nitro_en
- obj-$(CONFIG_ACRN_HSM)		+= acrn/
+@@ -12,3 +12,5 @@ obj-$(CONFIG_ACRN_HSM)		+= acrn/
  obj-$(CONFIG_EFI_SECRET)	+= coco/efi_secret/
  obj-$(CONFIG_SEV_GUEST)		+= coco/sev-guest/
+ obj-$(CONFIG_INTEL_TDX_GUEST)	+= coco/tdx-guest/
 +
 +obj-$(CONFIG_VSMP)             += vsmp/
 --- /dev/null
diff --git a/0002-USB-xhci-make-xhci_get_endpoint_address-static.patch b/0002-USB-xhci-make-xhci_get_endpoint_address-static.patch
deleted file mode 100644
index 76b23f0f2f6226..00000000000000
--- a/0002-USB-xhci-make-xhci_get_endpoint_address-static.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7a69923c1e15500776aafcc706646ec2bf17ed17 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Thu, 1 Sep 2022 15:46:19 +0200
-Subject: [PATCH 2/2] USB: xhci: make xhci_get_endpoint_address static
-
-This is only called in the xhci.c file, so make the symbol static.
-
-Cc: Mathias Nyman <mathias.nyman@intel.com>
-Cc: linux-usb@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/host/xhci.c |    2 +-
- drivers/usb/host/xhci.h |    1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -1482,7 +1482,7 @@ EXPORT_SYMBOL_GPL(xhci_get_endpoint_inde
- /* The reverse operation to xhci_get_endpoint_index. Calculate the USB endpoint
-  * address from the XHCI endpoint index.
-  */
--unsigned int xhci_get_endpoint_address(unsigned int ep_index)
-+static unsigned int xhci_get_endpoint_address(unsigned int ep_index)
- {
- 	unsigned int number = DIV_ROUND_UP(ep_index, 2);
- 	unsigned int direction = ep_index % 2 ? USB_DIR_OUT : USB_DIR_IN;
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -2041,7 +2041,6 @@ int xhci_setup_addressable_virt_dev(stru
- void xhci_copy_ep0_dequeue_into_input_ctx(struct xhci_hcd *xhci,
- 		struct usb_device *udev);
- unsigned int xhci_get_endpoint_index(struct usb_endpoint_descriptor *desc);
--unsigned int xhci_get_endpoint_address(unsigned int ep_index);
- unsigned int xhci_last_valid_endpoint(u32 added_ctxs);
- void xhci_endpoint_zero(struct xhci_hcd *xhci, struct xhci_virt_device *virt_dev, struct usb_host_endpoint *ep);
- void xhci_update_tt_active_eps(struct xhci_hcd *xhci,
diff --git a/0002-arch-wire-up-the-readfile-syscall.patch b/0002-arch-wire-up-the-readfile-syscall.patch
index 76a5c67bb57b9c..4d50e8a0dd0168 100644
--- a/0002-arch-wire-up-the-readfile-syscall.patch
+++ b/0002-arch-wire-up-the-readfile-syscall.patch
@@ -116,7 +116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +451	common	readfile			sys_readfile
 --- a/arch/powerpc/kernel/syscalls/syscall.tbl
 +++ b/arch/powerpc/kernel/syscalls/syscall.tbl
-@@ -530,3 +530,4 @@
+@@ -537,3 +537,4 @@
  448	common	process_mrelease		sys_process_mrelease
  449	common  futex_waitv                     sys_futex_waitv
  450 	nospu	set_mempolicy_home_node		sys_set_mempolicy_home_node
@@ -168,7 +168,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +451	common	readfile			sys_readfile
 --- a/include/linux/syscalls.h
 +++ b/include/linux/syscalls.h
-@@ -1056,6 +1056,8 @@ asmlinkage long sys_memfd_secret(unsigne
+@@ -1058,6 +1058,8 @@ asmlinkage long sys_memfd_secret(unsigne
  asmlinkage long sys_set_mempolicy_home_node(unsigned long start, unsigned long len,
  					    unsigned long home_node,
  					    unsigned long flags);
diff --git a/0002-scripts-selinux-use-grep-E-instead-of-egrep.patch b/0002-scripts-selinux-use-grep-E-instead-of-egrep.patch
deleted file mode 100644
index a8d1a9c64c0462..00000000000000
--- a/0002-scripts-selinux-use-grep-E-instead-of-egrep.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 60c12e0a39567979e05625ccd275192e1e720e74 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Tue, 20 Sep 2022 19:10:40 +0200
-Subject: [PATCH 2/3] scripts/selinux: use "grep -E" instead of "egrep"
-
-The latest version of grep claims that egrep is now obsolete so the build
-now contains warnings that look like:
-	egrep: warning: egrep is obsolescent; using grep -E
-fix this up by moving the vdso Makefile to use "grep -E" instead.
-
-Cc: Paul Moore <paul@paul-moore.com>
-Cc: Stephen Smalley <stephen.smalley.work@gmail.com>
-Cc: Eric Paris <eparis@parisplace.org>
-Cc: selinux@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- scripts/selinux/install_policy.sh |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/scripts/selinux/install_policy.sh
-+++ b/scripts/selinux/install_policy.sh
-@@ -78,7 +78,7 @@ cd /etc/selinux/dummy/contexts/files
- $SF -F file_contexts /
- 
- mounts=`cat /proc/$$/mounts | \
--	egrep "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \
-+	grep -E "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \
- 	awk '{ print $2 '}`
- $SF -F file_contexts $mounts
- 
diff --git a/0003-selftests-add-readfile-2-selftests.patch b/0003-selftests-add-readfile-2-selftests.patch
index f9c6180cb3d978..382331f1d3eed3 100644
--- a/0003-selftests-add-readfile-2-selftests.patch
+++ b/0003-selftests-add-readfile-2-selftests.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/tools/testing/selftests/Makefile
 +++ b/tools/testing/selftests/Makefile
-@@ -61,6 +61,7 @@ TARGETS += resctrl
+@@ -65,6 +65,7 @@ TARGETS += resctrl
  TARGETS += rlimits
  TARGETS += rseq
  TARGETS += rtc
diff --git a/series b/series
index 9cc616a0543a2d..605edb24899355 100644
--- a/series
+++ b/series
@@ -1,10 +1,6 @@
 #
-0001-scsi-stex-properly-zero-out-the-passthrough-command-.patch
+usb.patch
 0001-vsmp-driver.patch
-0001-PCI-ACPI-do-not-reference-a-pci-device-after-it-has-.patch
-0002-USB-xhci-make-xhci_get_endpoint_address-static.patch
-0001-lib-vdso-use-grep-E-instead-of-egrep.patch
-0002-scripts-selinux-use-grep-E-instead-of-egrep.patch
 0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch
 0001-driver-core-aux-test-code.patch
 copying.patch
@@ -15,7 +11,6 @@ copying.patch
 spdxcheck-print-out-files-without-any-spdx-lines.patch
 
 
-usb_DEVICE_ATTR.patch
 
 0001-Kbuild-provide-a-common-kernel-installation-script.patch
 
diff --git a/usb.patch b/usb.patch
new file mode 100644
index 00000000000000..693dfc235e3f2b
--- /dev/null
+++ b/usb.patch
@@ -0,0 +1,24 @@
+---
+ drivers/usb/storage/unusual_uas.h |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/drivers/usb/storage/unusual_uas.h
++++ b/drivers/usb/storage/unusual_uas.h
+@@ -118,6 +118,17 @@ UNUSUAL_DEV(0x152d, 0x0578, 0x0000, 0x99
+ 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ 		US_FL_BROKEN_FUA),
+ 
++/* Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> */
++UNUSUAL_DEV(0x152d, 0x0583, 0x0000, 0x9999,
++		"JMicron",
++		"JMS583",
++		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
++		US_FL_NO_READ_CAPACITY_16 |
++		//US_FL_NEEDS_CAP16 |
++		US_FL_NO_REPORT_OPCODES |
++		US_FL_ALWAYS_SYNC |
++		US_FL_NO_SAME ),
++
+ /* Reported-by: Thinh Nguyen <thinhn@synopsys.com> */
+ UNUSUAL_DEV(0x154b, 0xf00b, 0x0000, 0x9999,
+ 		"PNY",
diff --git a/usb_DEVICE_ATTR.patch b/usb_DEVICE_ATTR.patch
deleted file mode 100644
index d59eb0d0ab0168..00000000000000
--- a/usb_DEVICE_ATTR.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From foo@baz Fri Nov 30 11:15:46 CET 2018
-Date: Fri, 30 Nov 2018 11:15:46 +0100
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: [PATCH] USB: gadget: f_mass_storage: get rid of DEVICE_ATTR() usage
-
-The last holdout in the drivers/usb/* tree using DEVICE_ATTR() is the
-f_mass_storage driver, so move it to use DEVICE_ATTR_RW() instead.  The
-mode is overridden in the is_visible callback to set it properly
-depending on if this is a cdrom or removable device.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/gadget/function/f_mass_storage.c |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/gadget/function/f_mass_storage.c
-+++ b/drivers/usb/gadget/function/f_mass_storage.c
-@@ -2662,11 +2662,16 @@ static ssize_t forced_eject_store(struct
- }
- 
- static DEVICE_ATTR_RW(nofua);
--/* mode wil be set in fsg_lun_attr_is_visible() */
--static DEVICE_ATTR(ro, 0, ro_show, ro_store);
--static DEVICE_ATTR(file, 0, file_show, file_store);
- static DEVICE_ATTR_WO(forced_eject);
- 
-+/*
-+ * Mode of the ro and file attribute files will be overridden in
-+ * fsg_lun_dev_is_visible() depending on if this is a cdrom, or if it is a
-+ * removable device.
-+ */
-+static DEVICE_ATTR_RW(ro);
-+static DEVICE_ATTR_RW(file);
-+
- /****************************** FSG COMMON ******************************/
- 
- static void fsg_lun_release(struct device *dev)