From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: Re: linux-next: manual merge of the pxa tree Date: Wed, 17 Sep 2008 22:40:45 +0100 Message-ID: <20080917214045.GB5475@flint.arm.linux.org.uk> References: <20080918063109.5aee733d.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from caramon.arm.linux.org.uk ([78.32.30.218]:42567 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753553AbYIQVlt (ORCPT ); Wed, 17 Sep 2008 17:41:49 -0400 Content-Disposition: inline In-Reply-To: <20080918063109.5aee733d.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Eric Miao , linux-next@vger.kernel.org On Thu, Sep 18, 2008 at 06:31:09AM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the pxa tree got a conflict in > arch/arm/mach-pxa/spitz.c between commit > fced80c735941fa518ac67c0b61bbe153fb8c050 ("[ARM] Convert asm/io.h to > linux/io.h") from the arm tree and commit > 546ed5880bf813e1386696c02d288d7ffba517d6 ("[ARM] pxa/spitz: use SPI-based > driver for ads7846, corgi-lcd and max1111") from the pxa tree. > > Just overlapping additions. I fixed it up (see below) and can carry the > fix. If you wait a bit, kicking my tree out will resolve that (since those changes have been merged today.) -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: