linux-kernel - Re: linux-next: manual merge of the scsi-mkp tree with the scsi 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]

Date:   Thu, 25 Jan 2018 15:18:19 -0800
From:   James Bottomley <James.Bottomley@...senPartnership.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Darren Trapp <darren.trapp@...ium.com>,
        Himanshu Madhani <himanshu.madhani@...ium.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the scsi tree

On Fri, 2018-01-26 at 09:39 +1100, Stephen Rothwell wrote:
> Hi Martin,
> 
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/scsi/qla2xxx/qla_init.c
> 
> between commit:
> 
>   07a21872cf2b ("scsi: qla2xxx: Fix queue ID for async abort with
> Multiqueue")
> 
> from the scsi tree and commit:
> 
>   b027a5ace443 ("scsi: qla2xxx: Fix queue ID for async abort with
> Multiqueue")
> 
> from the scsi-mkp tree.
> 
> Looks like you have updated your tree after James has merged it :-(

OK, I pulled my tree into sync now.  I also added the postmerge tree,
which I can rebase if it causes you similar problems (it's based on the
block tree).

James