Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755350Ab1FMX3G (ORCPT ); Mon, 13 Jun 2011 19:29:06 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:33003 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755192Ab1FMX27 (ORCPT ); Mon, 13 Jun 2011 19:28:59 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=kQBTPTitVxUTze+CAw9U+XORpXmiLU5N25oJ6x0dEu4R2xQFTjg3xy79h/pADJeHxL 9RWnoawm8kEiKNkjK/dk/CSSeW4bxaxkuZoKZSW+ESeT2EuWHnDiUuLoeHXcZ4xiKfXu 8oJFeSeeGqCvV2UW57jD4n/kbRd7OHbz81hgA= Subject: Re: [PATCH] Documentation:change all arch/i386 to arch/x86 in Documentation From: Wanlong Gao To: paulmck@linux.vnet.ibm.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 , Randy Dunlap , Nick Piggin , Karsten Keil , Michal Marek , James Bottomley , Martin Mares , Harry Wei , Chuck Lever , Trond Myklebust , Thomas Weber , Mike Frysinger , Jiri Kosina , "Justin P. Mattock" In-Reply-To: <20110613172344.GC2272@linux.vnet.ibm.com> References: <1307942898-3728-1-git-send-email-wanlong.gao@gmail.com> <20110613172344.GC2272@linux.vnet.ibm.com> Content-Type: text/plain; charset="UTF-8" Date: Tue, 14 Jun 2011 07:28:36 +0800 Message-ID: <1308007716.2267.2.camel@Tux> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1794 Lines: 41 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 > > > > Change all "arch/i386" to "arch/x86" in Documentaion/, > > since the directory has changed. > > > > Signed-off-by: Wanlong Gao > > 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? 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(-) -- 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/