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

[Niklas Cassel]

On Thu, Sep 17, 2026 at 08:39:06PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/ata/libata-scsi.c
> 
> between commit:
> 
>   6d81700ad7c48 ("ata: libata-scsi: do not raise UA for storage element depopulation and restoration")
> 
> from the origin tree and commit:
> 
>   c44f095a9d176 ("scsi: ata: libata: Use combined sense codes")
> 
> from the scsi-mkp 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.

Mark, thank you for the notice.

Martin, as Damien mentioned in the cover letter:
https://lore.kernel.org/linux-scsi/20260908090308.1085097-1-dlemoal@xxxxxxxxxx/T/#mcf890a9a7d47f717b6362a76c8fb8760a58d7761

Perhaps you could either:
-Rebase scsi-staging on top of -rc2
or
-Merge in -rc2 to scsi-staging


Kind regards,
Niklas