Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755487Ab1FNAGL (ORCPT <rfc822;w@1wt.eu>);
	Mon, 13 Jun 2011 20:06:11 -0400
Received: from e7.ny.us.ibm.com ([32.97.182.137]:37552 "EHLO e7.ny.us.ibm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755419Ab1FNAGH (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 13 Jun 2011 20:06:07 -0400
Date: Mon, 13 Jun 2011 17:06:01 -0700
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Wanlong Gao <wanlong.gao@gmail.com>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
        netdev@vger.kernel.org, linux-kbuild@vger.kernel.org,
        linux-video@atrey.karlin.mff.cuni.cz,
        xiyoulinuxkernelgroup@googlegroups.com, linux-kernel@zh-kernel.org,
        Dipankar Sarma <dipankar@in.ibm.com>,
        Randy Dunlap <rdunlap@xenotime.net>, Nick Piggin <npiggin@kernel.dk>,
        Karsten Keil <isdn@linux-pingi.de>, Michal Marek <mmarek@suse.cz>,
        James Bottomley <James.Bottomley@HansenPartnership.com>,
        Martin Mares <mj@ucw.cz>, Harry Wei <harryxiyou@gmail.com>,
        Chuck Lever <chuck.lever@oracle.com>,
        Trond Myklebust <Trond.Myklebust@netapp.com>,
        Thomas Weber <weber@corscience.de>,
        Mike Frysinger <vapier.adi@gmail.com>, Jiri Kosina <jkosina@suse.cz>,
        "Justin P. Mattock" <justinmattock@gmail.com>
Subject: Re: [PATCH] Documentation:change all arch/i386 to arch/x86 in
 Documentation
Message-ID: <20110614000601.GO2326@linux.vnet.ibm.com>
Reply-To: paulmck@linux.vnet.ibm.com
References: <1307942898-3728-1-git-send-email-wanlong.gao@gmail.com>
 <20110613172344.GC2272@linux.vnet.ibm.com>
 <1308007716.2267.2.camel@Tux>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1308007716.2267.2.camel@Tux>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2177
Lines: 51

On Tue, Jun 14, 2011 at 07:28:36AM +0800, Wanlong Gao wrote:
> On 一, 2011-06-13 at 10:23 -0700, Paul E. McKenney wrote:
> > On Mon, Jun 13, 2011 at 01:28:18PM +0800, Wanlong Gao wrote:
> > > From: Wanlong Gao <wanlong.gao@gmail.com>
> > > 
> > > Change all "arch/i386" to "arch/x86" in Documentaion/,
> > > since the directory has changed.
> > > 
> > > Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com>
> > 
> > I have queued the Documentation/RCU/NMI-RCU.txt hunk with your
> > Signed-off-by, thank you!
> > 
> > 							Thanx, Paul
> Hi Paul:
> http://git.kernel.org/?p=linux/kernel/git/jikos/trivial.git;a=commitdiff;h=25eb650a690b95cb0e2cf0c3b03f4900a59e0135
> jiri had queued these all, will it get a merge failure?

If it does, I will drop mine.

							Thanx, Paul

> Thanks
> > 
> > > ---
> > >  Documentation/RCU/NMI-RCU.txt             |    4 +-
> > >  Documentation/blockdev/README.DAC960      |    2 +-
> > >  Documentation/blockdev/ramdisk.txt        |    8 +++---
> > >  Documentation/cpu-freq/cpu-drivers.txt    |    2 +-
> > >  Documentation/filesystems/nfs/nfsroot.txt |    2 +-
> > >  Documentation/isdn/README.HiSax           |    2 +-
> > >  Documentation/kbuild/makefiles.txt        |   38 ++++++++++++++--------------
> > >  Documentation/magic-number.txt            |    2 +-
> > >  Documentation/mca.txt                     |    6 ++--
> > >  Documentation/scheduler/sched-arch.txt    |    2 +-
> > >  Documentation/scsi/BusLogic.txt           |    2 +-
> > >  Documentation/serial/computone.txt        |    2 +-
> > >  Documentation/svga.txt                    |    2 +-
> > >  Documentation/zh_CN/magic-number.txt      |    2 +-
> > >  14 files changed, 38 insertions(+), 38 deletions(-)
> <snip patch>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/