From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Wed, 14 Dec 2016 12:21:25 +0000 Subject: [GIT PULL] arm64 updates for 4.10 In-Reply-To: References: <20161213192156.GA12471@e104818-lin.cambridge.arm.com> Message-ID: <20161214122125.GC28340@e104818-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Dec 13, 2016 at 04:58:33PM -0800, Linus Torvalds wrote: > On Tue, Dec 13, 2016 at 11:21 AM, Catalin Marinas > 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