From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753299Ab2LDLHD (ORCPT ); Tue, 4 Dec 2012 06:07:03 -0500 Received: from 8bytes.org ([85.214.48.195]:47748 "EHLO mail.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549Ab2LDLHA (ORCPT ); Tue, 4 Dec 2012 06:07:00 -0500 Date: Tue, 4 Dec 2012 12:06:56 +0100 From: Joerg Roedel To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Omar Ramirez Luna , Ohad Ben-Cohen , Paul Walmsley , Mike Turquette Subject: Re: linux-next: manual merge of the arm-soc tree with the iommu tree Message-ID: <20121204110655.GE18368@8bytes.org> References: <20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Tue Dec 4 12:06:58 2012 X-DSPAM-Confidence: 0.9985 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 50bdd95222976692010261 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM: > OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf > clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx: > clock: drop obsolete clock data") from the arm-soc tree. > > I just deleted the file as the latter did and can carry the fix as > necessary (no action is required). Ohad, Omar, any comment on this? Joerg From mboxrd@z Thu Jan 1 00:00:00 1970 From: joro@8bytes.org (Joerg Roedel) Date: Tue, 4 Dec 2012 12:06:56 +0100 Subject: linux-next: manual merge of the arm-soc tree with the iommu tree In-Reply-To: <20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au> References: <20121204154203.f0e7e87d1ae99e5c528434f8@canb.auug.org.au> Message-ID: <20121204110655.GE18368@8bytes.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM: > OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf > clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx: > clock: drop obsolete clock data") from the arm-soc tree. > > I just deleted the file as the latter did and can carry the fix as > necessary (no action is required). Ohad, Omar, any comment on this? Joerg