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

[Geert Uytterhoeven]

Hi Mark,

On Mon, 28 Sept 2026 at 16:23, Mark Brown <broonie@xxxxxxxxxx> wrote:
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
>   drivers/scsi/mpi3mr/mpi3mr_transport.c
>
> between commit:
>
>   29e3f0856e854 ("scsi: mpi3mr: Fix SAS port allocation and registration error handling")
>
> from the scsi tree and commit:
>
>   0b5b2fb484f3b ("Merge tag 'v7.3-rc2' into 7.4/scsi-staging")
>
> 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.
>
> diff --combined drivers/scsi/mpi3mr/mpi3mr_transport.c
> index a3412cd4ca5bc,8ee7ce1480c8d..0000000000000
> --- a/drivers/scsi/mpi3mr/mpi3mr_transport.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
> @@@ -1567,10 -1567,12 +1567,10 @@@ static struct mpi3mr_sas_port *mpi3mr_s
>         }
>
>         list_for_each_entry_safe(mr_sas_phy, next, &mr_sas_port->phy_list,
> -           port_siblings) {
> +                                port_siblings) {
>                 mr_sas_phy->phy_belongs_to_port = 0;
>                 list_del(&mr_sas_phy->port_siblings);
>         }
>  -      if (tgtdev)
>  -              mpi3mr_tgtdev_put(tgtdev);
>         kfree(mr_sas_port);
>         return NULL;
>   }

Are you sure this is correct?
Martin's conflict resolution in 0b5b2fb484f3b kept the

       if (tgtdev)
               mpi3mr_tgtdev_put(tgtdev);

part.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds