linux-kernel - Re: linux-next: build failure after merge of the scsi-mkp tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <c59b1a708980de24e94cd5f8d43799338d3235ec.camel@HansenPartnership.com>
Date: Thu, 07 Nov 2024 19:56:25 -0500
From: James Bottomley <James.Bottomley@...senPartnership.com>
To: "Martin K. Petersen" <martin.petersen@...cle.com>
Cc: 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

On Thu, 2024-11-07 at 16:31 -0500, Martin K. Petersen wrote:
> 
> 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.

OK, I figured it out.  We both did the conflict resolution for "scsi:
ufs: core: Fix another deadlock during RTC update" slightly
differently.  I kept the rtc variable introduced in that commit and you
removed it leading to the conflict.  Since it's only in a print, I
don't think it matters, so I followed your resolution.

James