From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758762Ab3BKTIm (ORCPT ); Mon, 11 Feb 2013 14:08:42 -0500 Received: from mail-we0-f169.google.com ([74.125.82.169]:33602 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758530Ab3BKTIk (ORCPT ); Mon, 11 Feb 2013 14:08:40 -0500 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:1b02:ae16:2dff:fe07:4e83] In-Reply-To: <20130211185221.GR4801@atomide.com> References: <20130211170616.73fd9fd30bb10c27a698ad4d@canb.auug.org.au> <20130211185221.GR4801@atomide.com> Date: Mon, 11 Feb 2013 11:08:38 -0800 Message-ID: Subject: Re: linux-next: manual merge of the arm-soc tree with the mfd tree From: Olof Johansson To: Tony Lindgren Cc: Stephen Rothwell , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros , Samuel Ortiz , Paul Walmsley , Felipe Balbi 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 On Mon, Feb 11, 2013 at 10:52 AM, 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. Yes, as I replied on the original patch series last night, please sort this out so we can avoid these nagging merge conflicts. Tony's steps in the previous email is the right way to handle these kind of things. -Olof From mboxrd@z Thu Jan 1 00:00:00 1970 From: olof@lixom.net (Olof Johansson) Date: Mon, 11 Feb 2013 11:08:38 -0800 Subject: linux-next: manual merge of the arm-soc tree with the mfd tree In-Reply-To: <20130211185221.GR4801@atomide.com> References: <20130211170616.73fd9fd30bb10c27a698ad4d@canb.auug.org.au> <20130211185221.GR4801@atomide.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Feb 11, 2013 at 10:52 AM, 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. Yes, as I replied on the original patch series last night, please sort this out so we can avoid these nagging merge conflicts. Tony's steps in the previous email is the right way to handle these kind of things. -Olof