On Tue, Dec 13, 2016 at 11:21 AM, Catalin Marinas <catalin.mari...@arm.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. Thanks, Linus