Re: linux-next: manual merge of the libata tree with the origin tree

[Niklas Cassel]

On Mon, Jun 01, 2026 at 05:59:20PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the libata tree got a conflict in:
> 
>   drivers/ata/libata-scsi.c
> 
> between commits:
> 
>   759e8756da00a ("ata: libata-scsi: do not needlessly defer commands when using PMP with FBS")
>   360190bd965f9 ("ata: libata-scsi: improve readability of ata_scsi_qc_issue()")
> 
> from the origin tree and commit:
> 
>   374a9cb4bd6a0 ("ata: libata: Pass ap parameter directly to functions in the issuing path")
> 
> from the libata 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.

Hello Mark,

Thank you for the heads-up!

Since we are about three weeks away from the merge window opening,
I decided to simply rebase our for-next branch.
(Instead of merging in the fixes branch to for-next.)

FWIW, your conflict resolution looks correct.
(But should not be needed for tomorrow's linux-next tag.)


Kind regards,
Niklas