linux-kernel - Re: [GIT PULL] remoteproc updates for v4.14

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 for Android: free password hash cracker in your pocket

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

Message-ID: <CA+55aFwAWW7rKjV8OsKAt_vW22HkuME1wb2LE3Qw-5D4V1U+xA@mail.gmail.com>
Date:   Sat, 9 Sep 2017 14:34:22 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Bjorn Andersson <bjorn.andersson@...aro.org>
Cc:     Ohad Ben-Cohen <ohad@...ery.com>, linux-remoteproc@...r.kernel.org,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Suman Anna <s-anna@...com>,
        Philipp Zabel <p.zabel@...gutronix.de>,
        Oleksij Rempel <o.rempel@...gutronix.de>,
        Bhumika Goyal <bhumirks@...il.com>,
        Himanshu Jha <himanshujha199640@...il.com>
Subject: Re: [GIT PULL] remoteproc updates for v4.14

On Fri, Sep 8, 2017 at 2:39 PM, Bjorn Andersson
<bjorn.andersson@...aro.org> wrote:
>
> The arising conflict is very trivial; both changes should be included in
> full and the "menu" should encapsulate QCOM_GLINK_SSR. Can you resolve
> this as you're applying the later of the two pull requests?

I haven't seen the arm-soc pull request yet, but I'll try to remember when I do.

But if it ends up being a real data conflict (as opposed to a silent
semantic conflict - and it sounds like it will be) I'm sure I'll
remember when I see it.

                 Linus