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

From: Martin K. Petersen
Date: Wed Aug 11 2021 - 23:25:45 EST



Stephen,

> Today's linux-next merge of the scsi-mkp tree got conflicts in:
>
> drivers/scsi/mpt3sas/mpt3sas_base.c
> drivers/scsi/mpt3sas/mpt3sas_base.h

Fixed this up. Thanks!

--
Martin K. Petersen Oracle Linux Engineering