From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755156AbcLNMVf (ORCPT ); Wed, 14 Dec 2016 07:21:35 -0500 Received: from foss.arm.com ([217.140.101.70]:43142 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752680AbcLNMVe (ORCPT ); Wed, 14 Dec 2016 07:21:34 -0500 Date: Wed, 14 Dec 2016 12:21:25 +0000 From: Catalin Marinas To: Linus Torvalds Cc: Marc Zyngier , Andrew Lutomirski , Will Deacon , Linux Kernel Mailing List , "linux-arm-kernel@lists.infradead.org" Subject: Re: [GIT PULL] arm64 updates for 4.10 Message-ID: <20161214122125.GC28340@e104818-lin.cambridge.arm.com> References: <20161213192156.GA12471@e104818-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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