linux-kernel - Re: linux-next: manual merge of the scsi tree with the tip 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: <20170121001233.6699f1b3@canb.auug.org.au>
Date:   Sat, 21 Jan 2017 00:12:33 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ingo Molnar <mingo@...nel.org>
Cc:     James Bottomley <James.Bottomley@...senPartnership.com>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        "Martin K. Petersen" <martin.petersen@...cle.com>
Subject: Re: linux-next: manual merge of the scsi tree with the tip tree

Hi Ingo,

On Fri, 20 Jan 2017 07:35:52 +0100 Ingo Molnar <mingo@...nel.org> wrote:
>
> I only had that patch for testing and it went into the -next branch by accident - 
> I have removed it so the conflict should be gone next time -next is integrated.

Thanks, these things happen.

-- 
Cheers,
Stephen Rothwell