Commit 35748ddd3b2c for kernel

commit 35748ddd3b2c91555bd86b8cf88edc90e7317e57
Merge: 531ed942bb0d 376a3960e5ef
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Aug 21 11:23:20 2026 -0700

    Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

    Pull SCSI updates from James Bottomley:
     "One new driver: leapraid (similar to mpi3mr but OK'd by Broadcom). The
      usual suspects for driver updates (ufs, qla2xxx, smartpqi, zfcp, fnic,
      ibmvfc) plus a few small core updates: a fix for an uninitialized sg
      list pad bytes plus the removal of the dma mask check for max sectors.

      The big update in the sd driver is mostly code refactoring for obscure
      error leg handling"

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (195 commits)
      scsi: fnic: Fix built-in NVMe/FC build
      scsi: fnic: Fix invalid comparison for error
      scsi: core: Fill in DMA padding bytes in scsi_alloc_sgtables()
      scsi: zfcp: Enable CONTEXT_ANALYSIS
      scsi: zfcp: Add __must_hold() attribute to zfcp_qdio_sbal_get()
      scsi: fnic: Use GFP_ATOMIC for VLAN alloc under spinlock
      scsi: storvsc: Support manual scans for all Hyper-V targets
      scsi: sd: Fix sd_done() sense handling condition
      scsi: sd: Fix special_vec mempool leak when scsi_alloc_sgtables() fails
      scsi: sd: Fix error handling in sd_probe() after large pool creation failure
      scsi: leapraid: Add driver documentation
      scsi: leapraid: Add new SCSI driver
      scsi: ufs: Add support for the aggregated read query opcode
      scsi: ufs: Use unsigned types for the BSG query
      scsi: ibmvfc: Fix spelling mistake "Deleteing" -> "Deleting"
      scsi: qla2xxx: Update version to 12.00.00.2607b2
      scsi: qla2xxx: Bound i2c->length in I2C bsg handlers
      scsi: qla2xxx: Zero SFP DMA buffer in FRU/I2C bsg handlers
      scsi: qla2xxx: Validate BSG request_len before reading vendor_cmd[]
      scsi: qla2xxx: Zero-init bsg stack buffers to avoid info leak
      ...

diff --cc include/linux/device-id/zorro.h
index 5fdac8168983,000000000000..26827b9b90b6
mode 100644,000000..100644
--- a/include/linux/device-id/zorro.h
+++ b/include/linux/device-id/zorro.h
@@@ -1,19 -1,0 +1,23 @@@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +#ifndef LINUX_DEVICE_ID_ZORRO_H
 +#define LINUX_DEVICE_ID_ZORRO_H
 +
 +#ifdef __KERNEL__
 +#include <linux/types.h>
 +typedef unsigned long kernel_ulong_t;
 +#endif
 +
 +#define ZORRO_WILDCARD			(0xffffffff)	/* not official */
 +
 +#define ZORRO_DEVICE_MODALIAS_FMT	"zorro:i%08X"
 +
 +struct zorro_device_id {
 +	__u32 id;			/* Device ID or ZORRO_WILDCARD */
- 	kernel_ulong_t driver_data;	/* Data private to the driver */
++	union {
++		/* Data private to the driver */
++		kernel_ulong_t driver_data;
++		const void *driver_data_ptr;
++	};
 +};
 +
 +#endif /* ifndef LINUX_DEVICE_ID_ZORRO_H */