linux-kernel - Re: [GIT PULL] arm64 updates for 4.10

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: <20161214122125.GC28340@e104818-lin.cambridge.arm.com>
Date:   Wed, 14 Dec 2016 12:21:25 +0000
From:   Catalin Marinas <catalin.marinas@....com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Marc Zyngier <marc.zyngier@....com>,
        Andrew Lutomirski <luto@...nel.org>,
        Will Deacon <will.deacon@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "linux-arm-kernel@...ts.infradead.org" 
        <linux-arm-kernel@...ts.infradead.org>
Subject: Re: [GIT PULL] arm64 updates for 4.10

On Tue, Dec 13, 2016 at 04:58:33PM -0800, Linus Torvalds wrote:
> On Tue, Dec 13, 2016 at 11:21 AM, Catalin Marinas
> <catalin.marinas@....com> wrote:
> >
> > Please pull the arm64 updates for 4.10 below.
> 
> Mind checking that I got the conflict resolution right?
> 
> The conflict looked completely trivial, but with stuff moving across
> files and since I don't build the end result (much less boot it) I
> could easily have missed some screw-up of mine.

The conflict resolution is fine. Sorry, I forgot to mention it in the
pull request.

Thanks.

-- 
Catalin