diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-20 00:55:08 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-20 00:55:08 +0200 |
commit | acc5965b9ff8a1889f5b51466562896d59c6e1b9 (patch) | |
tree | 8cd651e6594a9133f216d59a4fa1f18d8c63fb26 /drivers/scsi | |
parent | Merge tag 'staging-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | misc: Kconfig: exclude mrvl-cn10k-dpi compilation for 32-bit systems (diff) | |
download | linux-acc5965b9ff8a1889f5b51466562896d59c6e1b9.tar.xz linux-acc5965b9ff8a1889f5b51466562896d59c6e1b9.zip |
Merge tag 'char-misc-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char / misc and other driver updates from Greg KH:
"Here is the "big" set of char/misc and other driver subsystem changes
for 6.11-rc1. Nothing major in here, just loads of new drivers and
updates. Included in here are:
- IIO api updates and new drivers added
- wait_interruptable_timeout() api cleanups for some drivers
- MODULE_DESCRIPTION() additions for loads of drivers
- parport out-of-bounds fix
- interconnect driver updates and additions
- mhi driver updates and additions
- w1 driver fixes
- binder speedups and fixes
- eeprom driver updates
- coresight driver updates
- counter driver update
- new misc driver additions
- other minor api updates
All of these, EXCEPT for the final Kconfig build fix for 32bit
systems, have been in linux-next for a while with no reported issues.
The Kconfig fixup went in 29 hours ago, so might have missed the
latest linux-next, but was acked by everyone involved"
* tag 'char-misc-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (330 commits)
misc: Kconfig: exclude mrvl-cn10k-dpi compilation for 32-bit systems
misc: delete Makefile.rej
binder: fix hang of unregistered readers
misc: Kconfig: add a new dependency for MARVELL_CN10K_DPI
virtio: add missing MODULE_DESCRIPTION() macro
agp: uninorth: add missing MODULE_DESCRIPTION() macro
spmi: add missing MODULE_DESCRIPTION() macros
dev/parport: fix the array out-of-bounds risk
samples: configfs: add missing MODULE_DESCRIPTION() macro
misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver
misc: keba: Fix missing AUXILIARY_BUS dependency
slimbus: Fix struct and documentation alignment in stream.c
MAINTAINERS: CC dri-devel list on Qualcomm FastRPC patches
misc: fastrpc: use coherent pool for untranslated Compute Banks
misc: fastrpc: support complete DMA pool access to the DSP
misc: fastrpc: add missing MODULE_DESCRIPTION() macro
misc: fastrpc: Add missing dev_err newlines
misc: fastrpc: Use memdup_user()
nvmem: core: Implement force_ro sysfs attribute
nvmem: Use sysfs_emit() for type attribute
...
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/imm.c | 1 | ||||
-rw-r--r-- | drivers/scsi/ppa.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index 6e779bb14d98..1d4c7310f1a6 100644 --- a/drivers/scsi/imm.c +++ b/drivers/scsi/imm.c @@ -1275,7 +1275,6 @@ static struct parport_driver imm_driver = { .name = "imm", .match_port = imm_attach, .detach = imm_detach, - .devmodel = true, }; module_parport_driver(imm_driver); diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index 2d9fcc45ad85..a06329b47851 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c @@ -1151,7 +1151,6 @@ static struct parport_driver ppa_driver = { .name = "ppa", .match_port = ppa_attach, .detach = ppa_detach, - .devmodel = true, }; module_parport_driver(ppa_driver); |