From: Greg Kroah-Hartman Date: Sat, 21 Mar 2026 15:54:03 +0000 (+0100) Subject: tweaks X-Git-Tag: v6.1.167~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae53ab68ce9d1d811fb2d39ae8423fc339700508;p=thirdparty%2Fkernel%2Fstable-queue.git tweaks --- diff --git a/queue-5.10/s390-xor-fix-xor_xc_2-inline-assembly-constraints.patch b/queue-5.10/s390-xor-fix-xor_xc_2-inline-assembly-constraints.patch index df086835a9..9b47d99380 100644 --- a/queue-5.10/s390-xor-fix-xor_xc_2-inline-assembly-constraints.patch +++ b/queue-5.10/s390-xor-fix-xor_xc_2-inline-assembly-constraints.patch @@ -8,6 +8,8 @@ Message-ID: <20260318075510.4102927-1-hca@linux.ibm.com> From: Heiko Carstens +[ Upstream commit f775276edc0c505dc0f782773796c189f31a1123 ] + The inline assembly constraints for xor_xc_2() are incorrect. "bytes", "p1", and "p2" are input operands, while all three of them are modified within the inline assembly. Given that the function consists only of this @@ -20,7 +22,6 @@ Signed-off-by: Heiko Carstens Reviewed-by: Vasily Gorbik Link: https://lore.kernel.org/r/20260302133500.1560531-2-hca@linux.ibm.com Signed-off-by: Vasily Gorbik -(cherry picked from commit f775276edc0c505dc0f782773796c189f31a1123) Signed-off-by: Greg Kroah-Hartman --- arch/s390/lib/xor.c | 4 ++-- diff --git a/queue-5.15/ata-libata-scsi-drop-dprintk-calls-for-cdb-translation.patch b/queue-5.15/ata-libata-scsi-drop-dprintk-calls-for-cdb-translation.patch deleted file mode 100644 index 82372370ea..0000000000 --- a/queue-5.15/ata-libata-scsi-drop-dprintk-calls-for-cdb-translation.patch +++ /dev/null @@ -1,127 +0,0 @@ -From stable+bounces-219683-greg=kroah.com@vger.kernel.org Wed Feb 25 19:10:43 2026 -From: Sasha Levin -Date: Wed, 25 Feb 2026 13:10:32 -0500 -Subject: ata: libata-scsi: drop DPRINTK calls for cdb translation -To: stable@vger.kernel.org -Cc: Hannes Reinecke , Damien Le Moal , Sasha Levin -Message-ID: <20260225181034.910635-2-sashal@kernel.org> - -From: Hannes Reinecke - -[ Upstream commit 1fe9fb71b2ffcedd794daacf4db2056a6cb5199e ] - -Drop DPRINTK calls for cdb translation as they are already covered -by other traces, and also drop the DPRINTK calls in ata_scsi_hotplug(). - -Signed-off-by: Hannes Reinecke -Signed-off-by: Damien Le Moal -Stable-dep-of: bb3a8154b1a1 ("ata: libata-scsi: refactor ata_scsi_translate()") -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/ata/libata-scsi.c | 20 +------------------- - 1 file changed, 1 insertion(+), 19 deletions(-) - -diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c -index b57027206ae1e..22c45bc64a95e 100644 ---- a/drivers/ata/libata-scsi.c -+++ b/drivers/ata/libata-scsi.c -@@ -1472,9 +1472,6 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc) - head = track % dev->heads; - sect = (u32)block % dev->sectors + 1; - -- DPRINTK("block %u track %u cyl %u head %u sect %u\n", -- (u32)block, track, cyl, head, sect); -- - /* Check whether the converted CHS can fit. - Cylinder: 0-65535 - Head: 0-15 -@@ -1597,7 +1594,6 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) - goto invalid_fld; - break; - default: -- DPRINTK("no-byte command\n"); - fp = 0; - goto invalid_fld; - } -@@ -1751,7 +1747,6 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, - early_finish: - ata_qc_free(qc); - scsi_done(cmd); -- DPRINTK("EXIT - early finish (good or error)\n"); - return 0; - - err_did: -@@ -1759,12 +1754,10 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, - cmd->result = (DID_ERROR << 16); - scsi_done(cmd); - err_mem: -- DPRINTK("EXIT - internal\n"); - return 0; - - defer: - ata_qc_free(qc); -- DPRINTK("EXIT - defer\n"); - if (rc == ATA_DEFER_LINK) - return SCSI_MLQUEUE_DEVICE_BUSY; - else -@@ -2491,8 +2484,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) - struct ata_port *ap = qc->ap; - struct scsi_cmnd *cmd = qc->scsicmd; - -- DPRINTK("ATAPI request sense\n"); -- - memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); - - #ifdef CONFIG_ATA_SFF -@@ -2531,8 +2522,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) - qc->complete_fn = atapi_sense_complete; - - ata_qc_issue(qc); -- -- DPRINTK("EXIT\n"); - } - - /* -@@ -2642,7 +2631,6 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) - qc->tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; - if (scmd->sc_data_direction == DMA_TO_DEVICE) { - qc->tf.flags |= ATA_TFLAG_WRITE; -- DPRINTK("direction: write\n"); - } - - qc->tf.command = ATA_CMD_PACKET; -@@ -4065,8 +4053,6 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev) - return 0; - - bad_cdb_len: -- DPRINTK("bad CDB len=%u, scsi_op=0x%02x, max=%u\n", -- scmd->cmd_len, scsi_op, dev->cdb_len); - scmd->result = DID_ERROR << 16; - scsi_done(scmd); - return 0; -@@ -4532,12 +4518,9 @@ void ata_scsi_hotplug(struct work_struct *work) - container_of(work, struct ata_port, hotplug_task.work); - int i; - -- if (ap->pflags & ATA_PFLAG_UNLOADING) { -- DPRINTK("ENTER/EXIT - unloading\n"); -+ if (ap->pflags & ATA_PFLAG_UNLOADING) - return; -- } - -- DPRINTK("ENTER\n"); - mutex_lock(&ap->scsi_scan_mutex); - - /* Unplug detached devices. We cannot use link iterator here -@@ -4553,7 +4536,6 @@ void ata_scsi_hotplug(struct work_struct *work) - ata_scsi_scan_host(ap, 0); - - mutex_unlock(&ap->scsi_scan_mutex); -- DPRINTK("EXIT\n"); - } - - /** --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 71e32858ec..fa25b17645 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -240,4 +240,3 @@ drm-amd-display-use-gfp_atomic-in-dc_create_stream_for_sink.patch mptcp-pm-avoid-sending-rm_addr-over-same-subflow.patch pmdomain-bcm-bcm2835-power-increase-asb-control-timeout.patch batman-adv-avoid-ogm-aggregation-when-skb-tailroom-is-insufficient.patch -ata-libata-scsi-drop-dprintk-calls-for-cdb-translation.patch