From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Dooks Subject: Re: linux-next: manual merge of the samsung tree Date: Tue, 8 Dec 2009 01:34:30 +0000 Message-ID: <20091208013430.GH23152@trinity.fluff.org> References: <20091208111722.2e8d9527.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from trinity.fluff.org ([89.16.178.74]:49404 "EHLO trinity.fluff.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935163AbZLHBeZ (ORCPT ); Mon, 7 Dec 2009 20:34:25 -0500 Content-Disposition: inline In-Reply-To: <20091208111722.2e8d9527.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Ben Dooks , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Tue, Dec 08, 2009 at 11:17:22AM +1100, Stephen Rothwell wrote: > Hi Ben, > > In today's linux-next merge of the samsung tree I noticed that the file > arch/arm/plat-s3c/dev-hsmmc2.c actually has some merge conflict artifacts > in it. > > I fixed them up (just by using the version from the arm tree) but it > would be good if this could be fixed in your tree as well (I notice that > Russell has already merged a (presumable) correct version of these files). I belive so, I've updated next-samsung from my for-rmk tree and added the rebased new trees to it which should fix it. -- Ben Q: What's a light-year? A: One-third less calories than a regular year.