From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754792Ab2AJIa1 (ORCPT ); Tue, 10 Jan 2012 03:30:27 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:33649 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499Ab2AJIa0 (ORCPT ); Tue, 10 Jan 2012 03:30:26 -0500 Date: Tue, 10 Jan 2012 09:30:20 +0100 From: Sascha Hauer To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Subject: Re: linux-next: please update the i.MX tree Message-ID: <20120110083020.GR5446@pengutronix.de> References: <20120110115218.e00ab8c01abd5b9ae9a3b166@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120110115218.e00ab8c01abd5b9ae9a3b166@canb.auug.org.au> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 09:29:46 up 58 days, 16:16, 21 users, load average: 0.24, 0.09, 0.06 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 10, 2012 at 11:52:18AM +1100, Stephen Rothwell wrote: > Hi Sascha, > > It looks like most (if not all) of the i.MX tree has been merged into the > arm-soc (and Linus') tree, so could you please update the i.MX tree to > eliminate the conflicts I am getting. Did this. Sorry, I was not aware that there is something in this branch. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |