From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932657Ab0GTUyL (ORCPT ); Tue, 20 Jul 2010 16:54:11 -0400 Received: from mail.bluewatersys.com ([202.124.120.130]:53093 "EHLO hayes.bluewaternz.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932624Ab0GTUyI (ORCPT ); Tue, 20 Jul 2010 16:54:08 -0400 Message-ID: <4C460D0B.4040407@bluewatersys.com> Date: Wed, 21 Jul 2010 08:54:35 +1200 From: Ryan Mallon User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4 MIME-Version: 1.0 To: Mark Brown CC: Stephen Rothwell , Takashi Iwai , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King Subject: Re: linux-next: manual merge of the sound tree with the arm tree References: <20100719110054.de489964.sfr@canb.auug.org.au> <20100720090355.GL10222@rakim.wolfsonmicro.main> In-Reply-To: <20100720090355.GL10222@rakim.wolfsonmicro.main> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/20/2010 09:03 PM, Mark Brown wrote: > On Mon, Jul 19, 2010 at 11:00:54AM +1000, Stephen Rothwell wrote: > >> Today's linux-next merge of the sound tree got a conflict in >> arch/arm/mach-ep93xx/clock.c between commit >> 5c6649e3c1511b183f12d2e884d2c172fe9001e0 ("ARM: AMBA: Add pclk definition >> for platforms using primecells") from the arm tree and commit >> ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support") >> from the sound tree. > >> Just overlapping additions. I fixed it up (see below) and can carry the >> fix as necessary. > > Ryan, can you investigate where (if anywhere is good) the best place to > carry the merge fixup is please? The fix is fine. I don't really know much about how merge conflicts are handled across trees, but I would think that it is probably easiest if Stephen carries it. ~Ryan -- Bluewater Systems Ltd - ARM Technology Solution Centre Ryan Mallon 5 Amuri Park, 404 Barbadoes St ryan@bluewatersys.com PO Box 13 889, Christchurch 8013 http://www.bluewatersys.com New Zealand Phone: +64 3 3779127 Freecall: Australia 1800 148 751 Fax: +64 3 3779135 USA 1800 261 2934