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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
From: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx>
Date: Wed, 11 Aug 2021 23:25:20 -0400
Cc: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx>, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>, Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>, Sreekanth Reddy <sreekanth.reddy@xxxxxxxxxxxx>
In-reply-to: <20210811154005.7fbbb9e2@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 11 Aug 2021 15:40:05 +1000")
Organization: Oracle Corporation
References: <20210811154005.7fbbb9e2@canb.auug.org.au>

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

References:
- linux-next: manual merge of the scsi-mkp tree with Linus' tree
  - From: Stephen Rothwell

Prev by Date: next/pending-fixes build: 195 builds: 6 failed, 189 passed, 5 errors, 7 warnings (v5.14-rc5-240-g5c6ff2f54dee)
Next by Date: linux-next: manual merge of the kvm-arm tree with the arm64 tree
Previous by thread: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Next by thread: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel] [Linux USB Development] [Yosemite News] [Linux SCSI]

Powered by Linux