From: Niklas Cassel <cassel@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
linux-ide@vger.kernel.org
Cc: Damien Le Moal <dlemoal@kernel.org>, Niklas Cassel <cassel@kernel.org>
Subject: [GIT PULL] ata changes for 7.4-rc1
Date: Mon, 26 Oct 2026 10:54:18 +0100 [thread overview]
Message-ID: <20261026095418.3270238-1-cassel@kernel.org> (raw)
Linus,
There is a semantic conflict with the SCSI tree: the merge is clean,
but it does not build. Commit c44f095a9d17 ("scsi: ata: libata: Use
combined sense codes") changed ata_scsi_set_sense() to take a single
combined sense code, and commit 3bab8c7e0c6b ("ata: libata-scsi: abort
multi-sector pass-through commands when multi_count is 0") in this pull
adds a new caller using the old calling convention.
Resolution (same fix as in linux-next):
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3583,7 +3583,8 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
unsigned int multi_count = 1 << (cdb[1] >> 5);
if (!dev->multi_count) {
- ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND, 0, 0);
+ ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND,
+ NO_ADDITIONAL_SENSE_INFORMATION);
return 1;
}
The following changes since commit cee9395acd8043be0644b25c34bfa86623f2b935:
Linux 7.3-rc1 (2026-08-30 13:34:40 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux tags/ata-7.4-rc1
for you to fetch changes up to 69be770908ae57354a41d7e1cc99ab46278d2e86:
ata: libata-sff: fix race between IRQ deferral and ata_sff_flush_pio_task() (2026-10-22 10:12:24 +0200)
----------------------------------------------------------------
ata changes for 7.4-rc1
- Make ata_generic refuse to bind to non-IDE devices (me)
- Add missing <linux/pm_runtime.h> includes (Vladimir)
- Add pata_cswarp driver for the Amiga CS-Lab Warp card (Paolo)
- Fix a use-after-free and a parport attach bug in pata_parport (Pei)
- Switch ahci_da850 to DEFINE_SIMPLE_DEV_PM_OPS() (Li)
- Documentation and kernel-doc fixes (Karl, Bart, me)
- Remove the broken sata_inic162x driver (Ethan)
- Fix probe() error paths in libata, libahci and several drivers (me)
- Fail probe in sata_dwc_460ex if host activation fails (Nikolay)
- Use the standard DMA engine API in pata_arasan_cf (Frank)
- Abort multi-sector pass-through commands when multi_count is 0 (Hui)
- Replace kmap_atomic() with kmap_local_page() in libata-sff (Danish)
- Revert the no longer needed JMB582/JMB585 32-bit DMA quirk (Mario)
- Enable SATA LED presence indication in sata_mv (Carlos)
- Re-enable FBS after error handling on a port multiplier (Kyrylo)
- Fix NO_FUA quirks shadowed by earlier quirk entries (me)
- Do not overwrite the Marvell PATA quirk port mask in ahci (zhoumin)
- Ignore libata.force transfer modes the host does not support (Rand)
- Fix a race between IRQ deferral and ata_sff_flush_pio_task() (me)
----------------------------------------------------------------
Bart Van Assche (1):
ata: libata: Fix scsi_done() documentation
Carlos Junior (1):
ata: sata_mv: enable SoC SATA LED presence indication
Danish Khateeb (1):
ata: libata-sff: replace kmap_atomic() with kmap_local_page()
Ethan Nelson-Moore (1):
ata: sata_inic162x: remove dangerous broken driver
Frank Li (1):
ata: pata_arasan_cf: use standard DMA engine API
Hui Peng (1):
ata: libata-scsi: abort multi-sector pass-through commands when multi_count is 0
Karl Mehltretter (1):
ata: libata-scsi: Fix ata_scsi_hotplug() reference in kernel-doc
Kyrylo Biryuk (1):
ata: libahci: re-enable FBS after error handling on a port multiplier
Li Jun (1):
ata: ahci_da850: switch to DEFINE_SIMPLE_DEV_PM_OPS
Mario Limonciello (1):
Revert "ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585"
Niklas Cassel (9):
ata: ata_generic: Do not bind to devices that are not IDE controllers
ata: ahci_st: Do not ignore errors when getting the reset controls
ata: ahci_st: Assert the power down reset in the probe() error path
ata: sata_fsl: Fix use-after-free of host_priv on probe() failure
ata: libahci: Free the IRQs when activating a multi-IRQ host fails
ata: libata: Do not leave ata_host_stop() registered when activation fails
ata: libata-core: Fix the ata_host_register() kdoc
ata: libata-core: Fix NO_FUA quirks shadowed by earlier quirk entries
ata: libata-sff: fix race between IRQ deferral and ata_sff_flush_pio_task()
Nikolay Borisov (1):
ata: sata_dwc_460ex: Don't enable interrupt if libATA core registration fails
Paolo Pisati (1):
ata: pata_cswarp: Add Amiga cslab ata support
Pei Xiao (2):
ata: pata_parport: Fix use-after-free in new_device_store
ata: pata_parport: fix parport attach idr_alloc for
Rand Deeb (1):
ata: libata-core: Ignore forced transfer modes the host does not support
Vladimir Oltean (1):
ata: add <linux/pm_runtime.h> where missing
zhoumin (1):
ata: ahci: preserve preset port masks
Documentation/driver-api/libata.rst | 4 +-
drivers/ata/Kconfig | 17 +-
drivers/ata/Makefile | 2 +-
drivers/ata/ahci.c | 50 +-
drivers/ata/ahci_brcm.c | 1 +
drivers/ata/ahci_ceva.c | 1 +
drivers/ata/ahci_da850.c | 6 +-
drivers/ata/ahci_qoriq.c | 1 +
drivers/ata/ahci_st.c | 78 +--
drivers/ata/ata_generic.c | 16 +
drivers/ata/libahci.c | 44 +-
drivers/ata/libahci_platform.c | 4 +
drivers/ata/libata-core.c | 102 +++-
drivers/ata/libata-scsi.c | 7 +-
drivers/ata/libata-sff.c | 45 +-
drivers/ata/pata_arasan_cf.c | 6 +-
drivers/ata/pata_cswarp.c | 183 +++++++
drivers/ata/pata_parport/pata_parport.c | 9 +-
drivers/ata/sata_dwc_460ex.c | 5 +-
drivers/ata/sata_fsl.c | 24 +-
drivers/ata/sata_inic162x.c | 903 --------------------------------
drivers/ata/sata_mv.c | 10 +-
drivers/ata/sata_qstor.c | 8 +-
include/linux/libata.h | 1 +
24 files changed, 495 insertions(+), 1032 deletions(-)
create mode 100644 drivers/ata/pata_cswarp.c
delete mode 100644 drivers/ata/sata_inic162x.c
next reply other threads:[~2026-10-26 9:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-26 9:54 Niklas Cassel [this message]
2026-10-26 17:25 ` [GIT PULL] ata changes for 7.4-rc1 pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261026095418.3270238-1-cassel@kernel.org \
--to=cassel@kernel.org \
--cc=dlemoal@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.