On Fri, Sep 8, 2017 at 2:39 PM, Bjorn Andersson
<bjorn.andersson@xxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-remoteproc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
