linux-kernel - Re: linux-next: manual merge of the scsi-mkp tree with the char-misc 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] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 12 Apr 2017 17:44:34 +0000
From:   Bart Van Assche <Bart.VanAssche@...disk.com>
To:     "martin.petersen@...cle.com" <martin.petersen@...cle.com>
CC:     "sfr@...b.auug.org.au" <sfr@...b.auug.org.au>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "logang@...tatee.com" <logang@...tatee.com>,
        "linux-scsi@...r.kernel.org" <linux-scsi@...r.kernel.org>,
        "greg@...ah.com" <greg@...ah.com>, "arnd@...db.de" <arnd@...db.de>,
        "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc
 tree

On Tue, 2017-04-11 at 21:00 -0400, Martin K. Petersen wrote:
> Bart Van Assche <bart.vanassche@...disk.com> writes:
> > Sorry that I had not yet noticed Logan's patch series. Should my two
> > patches that conflict with Logan's patch series be dropped and
> > reworked after Logan's patches are upstream?
> 
> Obviously things break the minute you go on vacation. I'm back
> now. What's the current status?

Hello Martin,

Logan's patch series has been queued by Greg KH for kernel 4.12. So Linus
will have to resolve the merge conflict between Greg's char-misc tree and
the SCSI tree during the 4.12 merge window. See also
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/log/?h=char-misc-next&ofs=250

Bart.