[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <yq1fro2ycyp.fsf@ca-mkp.ca.oracle.com>
Date: Thu, 07 Nov 2024 16:31:35 -0500
From: "Martin K. Petersen" <martin.petersen@...cle.com>
To: James Bottomley <James.Bottomley@...senPartnership.com>
Cc: "Martin K. Petersen" <martin.petersen@...cle.com>,
Stephen Rothwell
<sfr@...b.auug.org.au>,
Linux Kernel Mailing List
<linux-kernel@...r.kernel.org>,
Linux Next Mailing List
<linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the scsi-mkp tree
James,
> No, my tree builds ... or at least the ufs-mcq.c part of it (I checked
> after I got the merge conflict ... although only with the default
> configuration).
I am not questioning that your tree builds. But your for-next branch
contains UFS code not present in the SCSI tree, effectively reverting my
conflict resolution.
--
Martin K. Petersen Oracle Linux Engineering
Powered by blists - more mailing lists