From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "smtp.linux-foundation.org", Issuer "CA Cert Signing Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 83B75DE134 for ; Thu, 1 May 2008 04:35:07 +1000 (EST) Date: Wed, 30 Apr 2008 11:35:00 -0700 From: Andrew Morton To: "Randy.Dunlap" Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) Message-Id: <20080430113500.dfe21880.akpm@linux-foundation.org> In-Reply-To: References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: Benjamin, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, Paul Mackerras , torvalds@linux-foundation.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, 29 Apr 2008 20:10:55 -0700 (PDT) "Randy.Dunlap" wrote: > From: Randy Dunlap > > Don't refer to file that no longer exists: > docproc: linux-2.6.25-git14/arch/powerpc/kernel/rio.c: No such file or directory > > Signed-off-by: Randy Dunlap > --- > Documentation/DocBook/rapidio.tmpl | 1 - > 1 file changed, 1 deletion(-) > > --- linux-2.6.25-git14.orig/Documentation/DocBook/rapidio.tmpl > +++ linux-2.6.25-git14/Documentation/DocBook/rapidio.tmpl > @@ -133,7 +133,6 @@ > !Idrivers/rapidio/rio-sysfs.c > > PPC32 support > -!Iarch/powerpc/kernel/rio.c > !Earch/powerpc/sysdev/fsl_rio.c > !Iarch/powerpc/sysdev/fsl_rio.c > grumble. This is a subset of rapidio-fix-docbook-references.patch, but I appear to be unable to interest anyone in merging/reviewing/accepting/anything-else that quite large set of patches. Guys, those patches were sent six weeks ago and it now looks like they will miss 2.6.26. This is pretty slack of us. Help? From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from xenotime.net (xenotime.net [66.160.160.81]) by ozlabs.org (Postfix) with SMTP id 1B5B0DDFFD for ; Thu, 1 May 2008 04:58:19 +1000 (EST) Received: from midway.site ([72.90.125.186]) by xenotime.net for ; Wed, 30 Apr 2008 11:48:09 -0700 Date: Wed, 30 Apr 2008 11:48:08 -0700 From: Randy Dunlap To: Andrew Morton Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) Message-Id: <20080430114808.64e2f40b.rdunlap@xenotime.net> In-Reply-To: <20080430113500.dfe21880.akpm@linux-foundation.org> References: <20080430113500.dfe21880.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: Benjamin, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, Paul Mackerras , torvalds@linux-foundation.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 30 Apr 2008 11:35:00 -0700 Andrew Morton wrote: > On Tue, 29 Apr 2008 20:10:55 -0700 (PDT) > "Randy.Dunlap" wrote: > > > From: Randy Dunlap > > > > Don't refer to file that no longer exists: > > docproc: linux-2.6.25-git14/arch/powerpc/kernel/rio.c: No such file or directory > > > > Signed-off-by: Randy Dunlap > > --- > > Documentation/DocBook/rapidio.tmpl | 1 - > > 1 file changed, 1 deletion(-) > > > > --- linux-2.6.25-git14.orig/Documentation/DocBook/rapidio.tmpl > > +++ linux-2.6.25-git14/Documentation/DocBook/rapidio.tmpl > > @@ -133,7 +133,6 @@ > > !Idrivers/rapidio/rio-sysfs.c > > > > PPC32 support > > -!Iarch/powerpc/kernel/rio.c > > !Earch/powerpc/sysdev/fsl_rio.c > > !Iarch/powerpc/sysdev/fsl_rio.c > > > > grumble. > > This is a subset of rapidio-fix-docbook-references.patch, but I appear to > be unable to interest anyone in merging/reviewing/accepting/anything-else > that quite large set of patches. > > Guys, those patches were sent six weeks ago and it now looks like they will > miss 2.6.26. This is pretty slack of us. Help? There's nothing there that can hurt. (famous last words) Just merge it. --- ~Randy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 92038DDEEA for ; Thu, 1 May 2008 05:01:50 +1000 (EST) Message-Id: <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> From: Kumar Gala To: Andrew Morton In-Reply-To: <20080430113500.dfe21880.akpm@linux-foundation.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Mime-Version: 1.0 (Apple Message framework v919.2) Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) Date: Wed, 30 Apr 2008 14:01:12 -0500 References: <20080430113500.dfe21880.akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, "Randy.Dunlap" , Paul Mackerras , torvalds@linux-foundation.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Apr 30, 2008, at 1:35 PM, Andrew Morton wrote: > On Tue, 29 Apr 2008 20:10:55 -0700 (PDT) > "Randy.Dunlap" wrote: > >> From: Randy Dunlap >> >> Don't refer to file that no longer exists: >> docproc: linux-2.6.25-git14/arch/powerpc/kernel/rio.c: No such file >> or directory >> >> Signed-off-by: Randy Dunlap >> --- >> Documentation/DocBook/rapidio.tmpl | 1 - >> 1 file changed, 1 deletion(-) >> >> --- linux-2.6.25-git14.orig/Documentation/DocBook/rapidio.tmpl >> +++ linux-2.6.25-git14/Documentation/DocBook/rapidio.tmpl >> @@ -133,7 +133,6 @@ >> !Idrivers/rapidio/rio-sysfs.c >> >> PPC32 support >> -!Iarch/powerpc/kernel/rio.c >> !Earch/powerpc/sysdev/fsl_rio.c >> !Iarch/powerpc/sysdev/fsl_rio.c >> > > grumble. > > This is a subset of rapidio-fix-docbook-references.patch, but I > appear to > be unable to interest anyone in merging/reviewing/accepting/anything- > else > that quite large set of patches. > > Guys, those patches were sent six weeks ago and it now looks like > they will > miss 2.6.26. This is pretty slack of us. Help? Odd. I thought Paul had picked up a docbook RapidIO patch from you in the latest merge round. - k From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "smtp.linux-foundation.org", Issuer "CA Cert Signing Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id DDB69DE4DA for ; Thu, 1 May 2008 05:12:46 +1000 (EST) Date: Wed, 30 Apr 2008 12:12:39 -0700 From: Andrew Morton To: Kumar Gala Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) Message-Id: <20080430121239.28492328.akpm@linux-foundation.org> In-Reply-To: <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, rdunlap@xenotime.net, paulus@samba.org, torvalds@linux-foundation.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 30 Apr 2008 14:01:12 -0500 Kumar Gala wrote: > > On Apr 30, 2008, at 1:35 PM, Andrew Morton wrote: > > On Tue, 29 Apr 2008 20:10:55 -0700 (PDT) > > "Randy.Dunlap" wrote: > > > >> From: Randy Dunlap > >> > >> Don't refer to file that no longer exists: > >> docproc: linux-2.6.25-git14/arch/powerpc/kernel/rio.c: No such file > >> or directory > >> > >> Signed-off-by: Randy Dunlap > >> --- > >> Documentation/DocBook/rapidio.tmpl | 1 - > >> 1 file changed, 1 deletion(-) > >> > >> --- linux-2.6.25-git14.orig/Documentation/DocBook/rapidio.tmpl > >> +++ linux-2.6.25-git14/Documentation/DocBook/rapidio.tmpl > >> @@ -133,7 +133,6 @@ > >> !Idrivers/rapidio/rio-sysfs.c > >> > >> PPC32 support > >> -!Iarch/powerpc/kernel/rio.c > >> !Earch/powerpc/sysdev/fsl_rio.c > >> !Iarch/powerpc/sysdev/fsl_rio.c > >> > > > > grumble. > > > > This is a subset of rapidio-fix-docbook-references.patch, but I > > appear to > > be unable to interest anyone in merging/reviewing/accepting/anything- > > else > > that quite large set of patches. > > > > Guys, those patches were sent six weeks ago and it now looks like > > they will > > miss 2.6.26. This is pretty slack of us. Help? > > Odd. I thought Paul had picked up a docbook RapidIO patch from you in > the latest merge round. > Well it's more than "a" patch. The six-week-old patch series is: rapidio-add-memory-mapping-driver-to-rapidio.patch rapidio-add-rapidio-space-allocation-bitmap-arithmetic.patch rapidio-add-fsl-rapidio-controller-memory-ops-functions.patch rapidio-add-the-rapidio-master-port-maintance-and-doorbell-window-to-space-resources.patch rapidio-add-rapidio-proc-fs-for-memory-mapping-debugging.patch rapidio-add-the-memory-mapping-support-in-rionet-driver.patch rapidio-fix-docbook-references.patch rapidio-fix-kernel-doc-problems.patch totalling: arch/powerpc/sysdev/fsl_rio.c | 13 + include/linux/rio.h | 10 drivers/net/Kconfig | 10 drivers/net/rionet.c | 324 ++++++++++++++++++++++++++++++ drivers/rapidio/Makefile | 1 drivers/rapidio/rio.c | 10 drivers/rapidio/sallocator/Kconfig | 9 drivers/rapidio/sallocator/Makefile | 12 + drivers/rapidio/sallocator/bitmap.c | 384 ++++++++++++++++++++++++++++++++++++ include/linux/rio.h | 10 include/linux/rio_drv.h | 41 +++ 16 files changed, 1425 insertions(+), 14 deletions(-) (seems that I forgot to cc Jeff on the rionet change too). Oh well. If nobody puts their hand up in the next 24 hours or so I'll just send it all in to Linus. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AD055DDF81 for ; Thu, 1 May 2008 06:32:01 +1000 (EST) Message-Id: From: Kumar Gala To: Andrew Morton In-Reply-To: <20080430121239.28492328.akpm@linux-foundation.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Mime-Version: 1.0 (Apple Message framework v919.2) Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) Date: Wed, 30 Apr 2008 15:31:48 -0500 References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> <20080430121239.28492328.akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, rdunlap@xenotime.net, paulus@samba.org, torvalds@linux-foundation.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Apr 30, 2008, at 2:12 PM, Andrew Morton wrote: > On Wed, 30 Apr 2008 14:01:12 -0500 > Kumar Gala wrote: > >> >> On Apr 30, 2008, at 1:35 PM, Andrew Morton wrote: >>> On Tue, 29 Apr 2008 20:10:55 -0700 (PDT) >>> "Randy.Dunlap" wrote: >>> >>>> From: Randy Dunlap >>>> >>>> Don't refer to file that no longer exists: >>>> docproc: linux-2.6.25-git14/arch/powerpc/kernel/rio.c: No such file >>>> or directory >>>> >>>> Signed-off-by: Randy Dunlap >>>> --- >>>> Documentation/DocBook/rapidio.tmpl | 1 - >>>> 1 file changed, 1 deletion(-) >>>> >>>> --- linux-2.6.25-git14.orig/Documentation/DocBook/rapidio.tmpl >>>> +++ linux-2.6.25-git14/Documentation/DocBook/rapidio.tmpl >>>> @@ -133,7 +133,6 @@ >>>> !Idrivers/rapidio/rio-sysfs.c >>>> >>>> PPC32 support >>>> -!Iarch/powerpc/kernel/rio.c >>>> !Earch/powerpc/sysdev/fsl_rio.c >>>> !Iarch/powerpc/sysdev/fsl_rio.c >>>> >>> >>> grumble. >>> >>> This is a subset of rapidio-fix-docbook-references.patch, but I >>> appear to >>> be unable to interest anyone in merging/reviewing/accepting/ >>> anything- >>> else >>> that quite large set of patches. >>> >>> Guys, those patches were sent six weeks ago and it now looks like >>> they will >>> miss 2.6.26. This is pretty slack of us. Help? >> >> Odd. I thought Paul had picked up a docbook RapidIO patch from you >> in >> the latest merge round. >> > > Well it's more than "a" patch. The six-week-old patch series is: > > rapidio-add-memory-mapping-driver-to-rapidio.patch > rapidio-add-rapidio-space-allocation-bitmap-arithmetic.patch > rapidio-add-fsl-rapidio-controller-memory-ops-functions.patch > rapidio-add-the-rapidio-master-port-maintance-and-doorbell-window-to- > space-resources.patch > rapidio-add-rapidio-proc-fs-for-memory-mapping-debugging.patch > rapidio-add-the-memory-mapping-support-in-rionet-driver.patch > rapidio-fix-docbook-references.patch > rapidio-fix-kernel-doc-problems.patch > > totalling: > > arch/powerpc/sysdev/fsl_rio.c | 13 + > include/linux/rio.h | 10 > drivers/net/Kconfig | 10 > drivers/net/rionet.c | 324 ++++++++++++++++++++++++++ > ++++ > drivers/rapidio/Makefile | 1 > drivers/rapidio/rio.c | 10 > drivers/rapidio/sallocator/Kconfig | 9 > drivers/rapidio/sallocator/Makefile | 12 + > drivers/rapidio/sallocator/bitmap.c | 384 ++++++++++++++++++++++++++ > ++++++++++ > include/linux/rio.h | 10 > include/linux/rio_drv.h | 41 +++ > 16 files changed, 1425 insertions(+), 14 deletions(-) > > > (seems that I forgot to cc Jeff on the rionet change too). > > > Oh well. If nobody puts their hand up in the next 24 hours or so > I'll just > send it all in to Linus. I'm raising my hand. The memory map driver needs further review. If the Docbook issues can be applied w/o the other patches I suggest we go forward with those. - k From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Message-ID: <18456.60948.463017.139935@cargo.ozlabs.ibm.com> Date: Thu, 1 May 2008 08:09:24 +1000 From: Paul Mackerras To: Andrew Morton Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) In-Reply-To: <20080430121239.28492328.akpm@linux-foundation.org> References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> <20080430121239.28492328.akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, rdunlap@xenotime.net, torvalds@linux-foundation.org, Zhang Wei List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Andrew Morton writes: > > Odd. I thought Paul had picked up a docbook RapidIO patch from you in > > the latest merge round. > > > > Well it's more than "a" patch. The six-week-old patch series is: > > rapidio-add-memory-mapping-driver-to-rapidio.patch > rapidio-add-rapidio-space-allocation-bitmap-arithmetic.patch > rapidio-add-fsl-rapidio-controller-memory-ops-functions.patch > rapidio-add-the-rapidio-master-port-maintance-and-doorbell-window-to-space-resources.patch > rapidio-add-rapidio-proc-fs-for-memory-mapping-debugging.patch > rapidio-add-the-memory-mapping-support-in-rionet-driver.patch > rapidio-fix-docbook-references.patch > rapidio-fix-kernel-doc-problems.patch What happened is that you (Andrew) sent them on to me pretty much unexamined. I took a look at them and dropped one of them because it created a new /proc file. I asked Kumar to look at them and he had issues with another three of the patches, and dropping those meant that all the following ones (including the fix-kernel-doc one) wouldn't apply, so I dropped them too. I applied the rest and sent them to Linus. > (seems that I forgot to cc Jeff on the rionet change too). Yeah. I nearly dropped that one too. I probably should have. :) > Oh well. If nobody puts their hand up in the next 24 hours or so I'll just > send it all in to Linus. Please don't. At this stage I think the best thing is for Kumar to talk to Zhang Wei (they both work for Freescale, so that should be possible in theory :) and get him to rework the remaining patches as required for inclusion in 2.6.27. Paul. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF37FDDE21 for ; Thu, 1 May 2008 08:14:48 +1000 (EST) Message-Id: <63DC9937-3C82-4744-8281-B9FDB941FEE1@kernel.crashing.org> From: Kumar Gala To: Randy Dunlap In-Reply-To: <20080430151149.063920cf.randy.dunlap@oracle.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Mime-Version: 1.0 (Apple Message framework v919.2) Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) Date: Wed, 30 Apr 2008 17:14:26 -0500 References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> <20080430121239.28492328.akpm@linux-foundation.org> <18456.60948.463017.139935@cargo.ozlabs.ibm.com> <20080430151149.063920cf.randy.dunlap@oracle.com> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, Paul Mackerras , Andrew Morton , torvalds@linux-foundation.org, "\"Zhang Wei\" rdunlap@xenotime.net" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Apr 30, 2008, at 5:11 PM, Randy Dunlap wrote: > On Thu, 1 May 2008 08:09:24 +1000 Paul Mackerras wrote: > >> Andrew Morton writes: >> >>>> Odd. I thought Paul had picked up a docbook RapidIO patch from >>>> you in >>>> the latest merge round. >>>> >>> >>> Well it's more than "a" patch. The six-week-old patch series is: >>> >>> rapidio-add-memory-mapping-driver-to-rapidio.patch >>> rapidio-add-rapidio-space-allocation-bitmap-arithmetic.patch >>> rapidio-add-fsl-rapidio-controller-memory-ops-functions.patch >>> rapidio-add-the-rapidio-master-port-maintance-and-doorbell-window- >>> to-space-resources.patch >>> rapidio-add-rapidio-proc-fs-for-memory-mapping-debugging.patch >>> rapidio-add-the-memory-mapping-support-in-rionet-driver.patch >>> rapidio-fix-docbook-references.patch >>> rapidio-fix-kernel-doc-problems.patch >> >> What happened is that you (Andrew) sent them on to me pretty much >> unexamined. I took a look at them and dropped one of them because it >> created a new /proc file. I asked Kumar to look at them and he had >> issues with another three of the patches, and dropping those meant >> that all the following ones (including the fix-kernel-doc one) >> wouldn't apply, so I dropped them too. I applied the rest and sent >> them to Linus. >> >>> (seems that I forgot to cc Jeff on the rionet change too). >> >> Yeah. I nearly dropped that one too. I probably should have. :) >> >>> Oh well. If nobody puts their hand up in the next 24 hours or so >>> I'll just >>> send it all in to Linus. >> >> Please don't. At this stage I think the best thing is for Kumar to >> talk to Zhang Wei (they both work for Freescale, so that should be >> possible in theory :) and get him to rework the remaining patches as >> required for inclusion in 2.6.27. > > Just to be clear, the docbook changes shouldn't wait for 2.6.27. > There's no need for that. Can the docbook be respun against linus's tree? -k From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rgminet01.oracle.com (rgminet01.oracle.com [148.87.113.118]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6D601DDF0D for ; Thu, 1 May 2008 08:17:56 +1000 (EST) Message-ID: <4818EFEC.4080003@oracle.com> Date: Wed, 30 Apr 2008 15:17:16 -0700 From: Randy Dunlap MIME-Version: 1.0 To: Kumar Gala Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> <20080430121239.28492328.akpm@linux-foundation.org> <18456.60948.463017.139935@cargo.ozlabs.ibm.com> <20080430151149.063920cf.randy.dunlap@oracle.com> <63DC9937-3C82-4744-8281-B9FDB941FEE1@kernel.crashing.org> In-Reply-To: <63DC9937-3C82-4744-8281-B9FDB941FEE1@kernel.crashing.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, Paul Mackerras , Andrew Morton , torvalds@linux-foundation.org, "\"Zhang Wei\" rdunlap@xenotime.net" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Kumar Gala wrote: > > On Apr 30, 2008, at 5:11 PM, Randy Dunlap wrote: >> On Thu, 1 May 2008 08:09:24 +1000 Paul Mackerras wrote: >> >>> Andrew Morton writes: >>> >>>>> Odd. I thought Paul had picked up a docbook RapidIO patch from you in >>>>> the latest merge round. >>>>> >>>> >>>> Well it's more than "a" patch. The six-week-old patch series is: >>>> >>>> rapidio-add-memory-mapping-driver-to-rapidio.patch >>>> rapidio-add-rapidio-space-allocation-bitmap-arithmetic.patch >>>> rapidio-add-fsl-rapidio-controller-memory-ops-functions.patch >>>> rapidio-add-the-rapidio-master-port-maintance-and-doorbell-window-to-space-resources.patch >>>> >>>> rapidio-add-rapidio-proc-fs-for-memory-mapping-debugging.patch >>>> rapidio-add-the-memory-mapping-support-in-rionet-driver.patch >>>> rapidio-fix-docbook-references.patch >>>> rapidio-fix-kernel-doc-problems.patch >>> >>> What happened is that you (Andrew) sent them on to me pretty much >>> unexamined. I took a look at them and dropped one of them because it >>> created a new /proc file. I asked Kumar to look at them and he had >>> issues with another three of the patches, and dropping those meant >>> that all the following ones (including the fix-kernel-doc one) >>> wouldn't apply, so I dropped them too. I applied the rest and sent >>> them to Linus. >>> >>>> (seems that I forgot to cc Jeff on the rionet change too). >>> >>> Yeah. I nearly dropped that one too. I probably should have. :) >>> >>>> Oh well. If nobody puts their hand up in the next 24 hours or so >>>> I'll just >>>> send it all in to Linus. >>> >>> Please don't. At this stage I think the best thing is for Kumar to >>> talk to Zhang Wei (they both work for Freescale, so that should be >>> possible in theory :) and get him to rework the remaining patches as >>> required for inclusion in 2.6.27. >> >> Just to be clear, the docbook changes shouldn't wait for 2.6.27. >> There's no need for that. > > Can the docbook be respun against linus's tree? Sure, I'll do that later, hopefully tonight. -- ~Randy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rgminet02.oracle.com (rgminet02.oracle.com [148.87.113.119]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5AEF8DDECF for ; Thu, 1 May 2008 09:00:51 +1000 (EST) Received: from rgminet01.oracle.com (rgminet01.oracle.com [148.87.113.118]) by rgminet02.oracle.com (Switch-3.2.4/Switch-3.1.7) with ESMTP id m3UMCZpX004490 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 30 Apr 2008 16:12:35 -0600 Date: Wed, 30 Apr 2008 15:11:49 -0700 From: Randy Dunlap To: Paul Mackerras Subject: Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come) Message-Id: <20080430151149.063920cf.randy.dunlap@oracle.com> In-Reply-To: <18456.60948.463017.139935@cargo.ozlabs.ibm.com> References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> <20080430121239.28492328.akpm@linux-foundation.org> <18456.60948.463017.139935@cargo.ozlabs.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, Andrew Morton , torvalds@linux-foundation.org, "\"Zhang Wei\" rdunlap@xenotime.net" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 1 May 2008 08:09:24 +1000 Paul Mackerras wrote: > Andrew Morton writes: > > > > Odd. I thought Paul had picked up a docbook RapidIO patch from you in > > > the latest merge round. > > > > > > > Well it's more than "a" patch. The six-week-old patch series is: > > > > rapidio-add-memory-mapping-driver-to-rapidio.patch > > rapidio-add-rapidio-space-allocation-bitmap-arithmetic.patch > > rapidio-add-fsl-rapidio-controller-memory-ops-functions.patch > > rapidio-add-the-rapidio-master-port-maintance-and-doorbell-window-to-space-resources.patch > > rapidio-add-rapidio-proc-fs-for-memory-mapping-debugging.patch > > rapidio-add-the-memory-mapping-support-in-rionet-driver.patch > > rapidio-fix-docbook-references.patch > > rapidio-fix-kernel-doc-problems.patch > > What happened is that you (Andrew) sent them on to me pretty much > unexamined. I took a look at them and dropped one of them because it > created a new /proc file. I asked Kumar to look at them and he had > issues with another three of the patches, and dropping those meant > that all the following ones (including the fix-kernel-doc one) > wouldn't apply, so I dropped them too. I applied the rest and sent > them to Linus. > > > (seems that I forgot to cc Jeff on the rionet change too). > > Yeah. I nearly dropped that one too. I probably should have. :) > > > Oh well. If nobody puts their hand up in the next 24 hours or so I'll just > > send it all in to Linus. > > Please don't. At this stage I think the best thing is for Kumar to > talk to Zhang Wei (they both work for Freescale, so that should be > possible in theory :) and get him to rework the remaining patches as > required for inclusion in 2.6.27. Just to be clear, the docbook changes shouldn't wait for 2.6.27. There's no need for that. --- ~Randy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rgminet01.oracle.com (rgminet01.oracle.com [148.87.113.118]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9A692DDF23 for ; Thu, 1 May 2008 09:47:09 +1000 (EST) Date: Wed, 30 Apr 2008 16:45:58 -0700 From: Randy Dunlap To: lkml Subject: [PATCH] rapidio: fix current kernel-doc notation Message-Id: <20080430164558.03b5f517.randy.dunlap@oracle.com> In-Reply-To: <4818EFEC.4080003@oracle.com> References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> <20080430121239.28492328.akpm@linux-foundation.org> <18456.60948.463017.139935@cargo.ozlabs.ibm.com> <20080430151149.063920cf.randy.dunlap@oracle.com> <63DC9937-3C82-4744-8281-B9FDB941FEE1@kernel.crashing.org> <4818EFEC.4080003@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: linuxppc-dev@ozlabs.org, Paul Mackerras , Andrew Morton , torvalds@linux-foundation.org, Wei.Zhang@freescale.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Randy Dunlap Fix current (-git16) missing docbook/kernel-doc notation in RapidIO files. Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'sys_size' Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'phy_type' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:188): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:224): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:245): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:270): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:311): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:996): No description found for parameter 'dev' Signed-off-by: Randy Dunlap --- arch/powerpc/sysdev/fsl_rio.c | 9 +++++++-- include/linux/rio.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) --- linux-2.6.25-git16.orig/include/linux/rio.h +++ linux-2.6.25-git16/include/linux/rio.h @@ -161,6 +161,8 @@ enum rio_phy_type { * @ops: configuration space functions * @id: Port ID, unique among all ports * @index: Port index, unique among all port interfaces of the same type + * @sys_size: RapidIO common transport system size + * @phy_type: RapidIO phy type * @name: Port name string * @priv: Master port private data */ --- linux-2.6.25-git16.orig/arch/powerpc/sysdev/fsl_rio.c +++ linux-2.6.25-git16/arch/powerpc/sysdev/fsl_rio.c @@ -176,6 +176,7 @@ struct rio_priv { /** * fsl_rio_doorbell_send - Send a MPC85xx doorbell message + * @mport: RapidIO master port info * @index: ID of RapidIO interface * @destid: Destination ID of target device * @data: 16-bit info field of RapidIO doorbell message @@ -211,6 +212,7 @@ static int fsl_rio_doorbell_send(struct /** * fsl_local_config_read - Generate a MPC85xx local config space read + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @offset: Offset into configuration space * @len: Length (in bytes) of the maintenance transaction @@ -232,6 +234,7 @@ static int fsl_local_config_read(struct /** * fsl_local_config_write - Generate a MPC85xx local config space write + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @offset: Offset into configuration space * @len: Length (in bytes) of the maintenance transaction @@ -254,6 +257,7 @@ static int fsl_local_config_write(struct /** * fsl_rio_config_read - Generate a MPC85xx read maintenance transaction + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @destid: Destination ID of transaction * @hopcount: Number of hops to target device @@ -295,6 +299,7 @@ fsl_rio_config_read(struct rio_mport *mp /** * fsl_rio_config_write - Generate a MPC85xx write maintenance transaction + * @mport: RapidIO master port info * @index: ID of RapdiIO interface * @destid: Destination ID of transaction * @hopcount: Number of hops to target device @@ -985,8 +990,8 @@ static inline void fsl_rio_info(struct d } /** - * fsl_rio_setup - Setup MPC85xx RapidIO interface - * @fsl_rio_setup - Setup Freescale PowerPC RapidIO interface + * fsl_rio_setup - Setup Freescale PowerPC RapidIO interface + * @dev: of_device pointer * * Initializes MPC85xx RapidIO hardware interface, configures * master port with system-specific info, and registers the From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB128DDDFD for ; Thu, 1 May 2008 13:58:59 +1000 (EST) Message-Id: From: Kumar Gala To: Randy Dunlap In-Reply-To: <20080430164558.03b5f517.randy.dunlap@oracle.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Mime-Version: 1.0 (Apple Message framework v919.2) Subject: Re: [PATCH] rapidio: fix current kernel-doc notation Date: Wed, 30 Apr 2008 22:57:14 -0500 References: <20080430113500.dfe21880.akpm@linux-foundation.org> <51A34080-7981-4958-B225-4921FC95B84A@kernel.crashing.org> <20080430121239.28492328.akpm@linux-foundation.org> <18456.60948.463017.139935@cargo.ozlabs.ibm.com> <20080430151149.063920cf.randy.dunlap@oracle.com> <63DC9937-3C82-4744-8281-B9FDB941FEE1@kernel.crashing.org> <4818EFEC.4080003@oracle.com> <20080430164558.03b5f517.randy.dunlap@oracle.com> Cc: lkml , linuxppc-dev@ozlabs.org, Paul Mackerras , Andrew Morton , torvalds@linux-foundation.org, Wei.Zhang@freescale.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Apr 30, 2008, at 6:45 PM, Randy Dunlap wrote: > From: Randy Dunlap > > Fix current (-git16) missing docbook/kernel-doc notation in RapidIO > files. > > Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description > found for parameter 'sys_size' > Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description > found for parameter 'phy_type' > > Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:188): No > description found for parameter 'mport' > Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:224): No > description found for parameter 'mport' > Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:245): No > description found for parameter 'mport' > Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:270): No > description found for parameter 'mport' > Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:311): No > description found for parameter 'mport' > Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:996): No > description found for parameter 'dev' > > Signed-off-by: Randy Dunlap > --- > arch/powerpc/sysdev/fsl_rio.c | 9 +++++++-- > include/linux/rio.h | 2 ++ > 2 files changed, 9 insertions(+), 2 deletions(-) applied. - k