Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: 2021-08-12 03:25:45
Also in:
lkml
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