From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933262Ab3BLOyS (ORCPT ); Tue, 12 Feb 2013 09:54:18 -0500 Received: from mga09.intel.com ([134.134.136.24]:65307 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933172Ab3BLOx4 (ORCPT ); Tue, 12 Feb 2013 09:53:56 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,650,1355126400"; d="scan'208";a="284706495" Date: Tue, 12 Feb 2013 15:53:36 +0100 From: Samuel Ortiz To: Roger Quadros Cc: Tony Lindgren , Stephen Rothwell , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Walmsley , Felipe Balbi Subject: Re: linux-next: manual merge of the arm-soc tree with the mfd tree Message-ID: <20130212145336.GI20996@sortiz-mobl> References: <20130211170616.73fd9fd30bb10c27a698ad4d@canb.auug.org.au> <20130211185221.GR4801@atomide.com> <511A55DB.7040808@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <511A55DB.7040808@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Roger, On Tue, Feb 12, 2013 at 04:46:51PM +0200, Roger Quadros wrote: > On 02/11/2013 08:52 PM, Tony Lindgren wrote: > > * Stephen Rothwell [130210 22:11]: > >> Hi all, > >> > >> Today's linux-next merge of the arm-soc tree got a conflict in > >> arch/arm/mach-omap2/usb-host.c between commit 8a89e93237e1 ("mfd: > >> omap-usb-host: Consolidate OMAP USB-HS platform data") from the mfd tree > >> and commit c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete > >> pm_lats and early_device code") from the arm-soc tree. > >> > >> I fixed it up (see below) and can carry the fix as necessary (no action > >> is required). > > > > Thanks again. > > > > Samuel, up to you, but I suggest you just drop these patches for > > now if still possible unless other patches are based on these. > > > > Samuel, please feel free to drop the 20 patches you pulled from me recently. > > I have another set patches that would depend on them and I think it is better if > both sets go through usb and arm-soc trees. This would avoid some confusion. > > Once you confirm I can add your Acked-by's to them and send fresh pull requests > to Tony & Greg. Thanks. I dropped all those patches from my mfd for-next tree now. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/