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, 10 Jul 2024 22:26:44 -0400
Cc: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx>, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>, Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>, Nathan Chancellor <nathan@xxxxxxxxxx>, Tomas Henzl <thenzl@xxxxxxxxxx>
In-reply-to: <20240709165708.3f8e3498@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 9 Jul 2024 16:57:08 +1000")
Organization: Oracle Corporation
References: <20240709165708.3f8e3498@canb.auug.org.au>

Stephen,

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

Now resolved. 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: linux-next: duplicate patch in the device-mapper tree
Next by Date: next/pending-fixes build: 8 builds: 0 failed, 8 passed, 21 warnings (v6.10-rc7-241-gaf63ffce3d70)
Previous by thread: 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