Re: [GIT PULL] arm64 updates for 4.10
From: Catalin Marinas
Date: Wed Dec 14 2016 - 07:21:43 EST
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@xxxxxxx> 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