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

Next message: Fan Wu: "[PATCH] usb: typec: altmodes/displayport: Disable work before dp is freed"
Previous message: Suren Baghdasaryan: "Re: [PATCH v10 5/6] alloc_tag: skip percpu counter allocation when profiling is disabled"
In reply to: Mark Brown: "linux-next: manual merge of the scsi-mkp tree with the origin tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

From: Martin K. Petersen

Date: Tue Sep 22 2026 - 23:01:06 EST

Mark,

> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/mpi3mr/mpi3mr_transport.c

Should be resolved as well.

--
Martin K. Petersen