From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership•com>,
Jens Axboe <axboe@kernel•dk>
Cc: Bart Van Assche <bvanassche@acm•org>,
Christoph Hellwig <hch@lst•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle•com>
Subject: linux-next: manual merge of the scsi tree with the block tree
Date: Tue, 7 Jan 2025 15:09:37 +1100 [thread overview]
Message-ID: <20250107150937.773b3776@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2902 bytes --]
Hi all,
Today's linux-next merge of the scsi tree got conflicts in:
drivers/ata/ahci.h
drivers/ata/sata_mv.c
include/linux/libata.h
between commit:
ce32496ec1ab ("block: simplify tag allocation policy selection")
from the block tree and commit:
47c2e30afcec ("scsi: Rename .device_configure() into .sdev_configure()")
from the scsi tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/ata/ahci.h
index 06781bdde0d2,75cdf51a7f74..000000000000
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@@ -396,8 -396,8 +396,8 @@@ extern const struct attribute_group *ah
.shost_groups = ahci_shost_groups, \
.sdev_groups = ahci_sdev_groups, \
.change_queue_depth = ata_scsi_change_queue_depth, \
- .tag_alloc_policy = BLK_TAG_ALLOC_RR, \
+ .tag_alloc_policy_rr = true, \
- .device_configure = ata_scsi_device_configure
+ .sdev_configure = ata_scsi_sdev_configure
extern struct ata_port_operations ahci_ops;
extern struct ata_port_operations ahci_platform_ops;
diff --cc drivers/ata/sata_mv.c
index 21c72650f9cc,caf7b1303d4c..000000000000
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@@ -672,8 -672,8 +672,8 @@@ static const struct scsi_host_template
.dma_boundary = MV_DMA_BOUNDARY,
.sdev_groups = ata_ncq_sdev_groups,
.change_queue_depth = ata_scsi_change_queue_depth,
- .tag_alloc_policy = BLK_TAG_ALLOC_RR,
+ .tag_alloc_policy_rr = true,
- .device_configure = ata_scsi_device_configure
+ .sdev_configure = ata_scsi_sdev_configure
};
static struct ata_port_operations mv5_ops = {
diff --cc include/linux/libata.h
index be5183d75736,7717f06a548d..000000000000
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -1467,14 -1466,14 +1466,14 @@@ extern const struct attribute_group *at
#define ATA_SUBBASE_SHT(drv_name) \
__ATA_BASE_SHT(drv_name), \
.can_queue = ATA_DEF_QUEUE, \
- .tag_alloc_policy = BLK_TAG_ALLOC_RR, \
+ .tag_alloc_policy_rr = true, \
- .device_configure = ata_scsi_device_configure
+ .sdev_configure = ata_scsi_sdev_configure
#define ATA_SUBBASE_SHT_QD(drv_name, drv_qd) \
__ATA_BASE_SHT(drv_name), \
.can_queue = drv_qd, \
- .tag_alloc_policy = BLK_TAG_ALLOC_RR, \
+ .tag_alloc_policy_rr = true, \
- .device_configure = ata_scsi_device_configure
+ .sdev_configure = ata_scsi_sdev_configure
#define ATA_BASE_SHT(drv_name) \
ATA_SUBBASE_SHT(drv_name), \
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-07 4:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 4:09 Stephen Rothwell [this message]
2025-01-07 6:03 ` linux-next: manual merge of the scsi tree with the block tree Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2023-06-19 3:14 Stephen Rothwell
2022-03-07 4:18 Stephen Rothwell
2022-03-07 4:14 Stephen Rothwell
2021-11-01 5:08 Stephen Rothwell
2021-08-24 6:32 Stephen Rothwell
2021-08-24 6:39 ` Christoph Hellwig
2020-03-25 5:04 Stephen Rothwell
2019-04-15 5:59 Stephen Rothwell
2019-04-15 13:48 ` Bart Van Assche
2019-04-17 19:11 ` Martin Wilck
2019-02-18 5:10 Stephen Rothwell
2017-06-21 5:55 Stephen Rothwell
2017-06-19 5:35 Stephen Rothwell
2016-11-08 5:48 Stephen Rothwell
2016-11-08 16:17 ` James Bottomley
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=20250107150937.773b3776@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=bvanassche@acm$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox