Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671Ab3GCAAp (ORCPT ); Tue, 2 Jul 2013 20:00:45 -0400 Received: from mail-qe0-f53.google.com ([209.85.128.53]:38106 "EHLO mail-qe0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752522Ab3GCAAo (ORCPT ); Tue, 2 Jul 2013 20:00:44 -0400 MIME-Version: 1.0 X-Originating-IP: [173.13.129.225] In-Reply-To: References: <201307022055.50717.arnd@arndb.de> <201307022104.01826.arnd@arndb.de> <20130702231706.GF24642@n2100.arm.linux.org.uk> Date: Tue, 2 Jul 2013 17:00:43 -0700 Message-ID: Subject: Re: [GIT PULL 3/7] ARM SoC specific changes From: Olof Johansson To: Linus Torvalds Cc: Russell King - ARM Linux , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , Linux Kernel Mailing List , ARM SoC Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 853 Lines: 23 On Tue, Jul 2, 2013 at 4:51 PM, Linus Torvalds wrote: > On Tue, Jul 2, 2013 at 4:17 PM, Russell King - ARM Linux > wrote: >> Please don't merge this yet. > > Oops, too late. The ARM SoC pull requests got merged a couple of hours ago.. It should hopefully not be a big problem, you'll see a merge conflict (so will sfr) when merging from Russell due to add/add conflicts been resolved by ordering them in opposite order in arch/arm/include/asm/glue-proc.h. Feel free to flip them back to Russell's preferred ordering at that time, of course. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/