linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] docbook: fix fatal rapidio yet again (and more to come)
@ 2008-04-30  3:10 Randy.Dunlap
  2008-04-30 18:35 ` Andrew Morton
  0 siblings, 1 reply; 11+ messages in thread
From: Randy.Dunlap @ 2008-04-30  3:10 UTC (permalink / raw)
  To: linux-kernel; +Cc: torvalds, akpm, mporter

From: Randy Dunlap <randy.dunlap@oracle.com>

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 <randy.dunlap@oracle.com>
---
 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
      </sect1>
      <sect1 id="PPC32_support"><title>PPC32 support</title>
-!Iarch/powerpc/kernel/rio.c
 !Earch/powerpc/sysdev/fsl_rio.c
 !Iarch/powerpc/sysdev/fsl_rio.c
      </sect1>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
  2008-04-30  3:10 [PATCH] docbook: fix fatal rapidio yet again (and more to come) Randy.Dunlap
@ 2008-04-30 18:35 ` Andrew Morton
  2008-04-30 18:48   ` Randy Dunlap
  2008-04-30 19:01   ` Kumar Gala
  0 siblings, 2 replies; 11+ messages in thread
From: Andrew Morton @ 2008-04-30 18:35 UTC (permalink / raw)
  To: Randy.Dunlap
  Cc: linux-kernel, torvalds, mporter, Paul Mackerras,
	Benjamin Herrenschmidt, linuxppc-dev

On Tue, 29 Apr 2008 20:10:55 -0700 (PDT)
"Randy.Dunlap" <rdunlap@xenotime.net> wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> 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 <randy.dunlap@oracle.com>
> ---
>  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
>       </sect1>
>       <sect1 id="PPC32_support"><title>PPC32 support</title>
> -!Iarch/powerpc/kernel/rio.c
>  !Earch/powerpc/sysdev/fsl_rio.c
>  !Iarch/powerpc/sysdev/fsl_rio.c
>       </sect1>

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?


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
  2008-04-30 18:35 ` Andrew Morton
@ 2008-04-30 18:48   ` Randy Dunlap
  2008-04-30 19:01   ` Kumar Gala
  1 sibling, 0 replies; 11+ messages in thread
From: Randy Dunlap @ 2008-04-30 18:48 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linux-kernel, torvalds, mporter, Paul Mackerras,
	Benjamin Herrenschmidt, linuxppc-dev

On Wed, 30 Apr 2008 11:35:00 -0700 Andrew Morton wrote:

> On Tue, 29 Apr 2008 20:10:55 -0700 (PDT)
> "Randy.Dunlap" <rdunlap@xenotime.net> wrote:
> 
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > 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 <randy.dunlap@oracle.com>
> > ---
> >  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
> >       </sect1>
> >       <sect1 id="PPC32_support"><title>PPC32 support</title>
> > -!Iarch/powerpc/kernel/rio.c
> >  !Earch/powerpc/sysdev/fsl_rio.c
> >  !Iarch/powerpc/sysdev/fsl_rio.c
> >       </sect1>
> 
> 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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
  2008-04-30 18:35 ` Andrew Morton
  2008-04-30 18:48   ` Randy Dunlap
@ 2008-04-30 19:01   ` Kumar Gala
  2008-04-30 19:12     ` Andrew Morton
  1 sibling, 1 reply; 11+ messages in thread
From: Kumar Gala @ 2008-04-30 19:01 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Randy.Dunlap, linux-kernel, torvalds, mporter, Paul Mackerras,
	Benjamin Herrenschmidt, linuxppc-dev


On Apr 30, 2008, at 1:35 PM, Andrew Morton wrote:
> On Tue, 29 Apr 2008 20:10:55 -0700 (PDT)
> "Randy.Dunlap" <rdunlap@xenotime.net> wrote:
>
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> 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 <randy.dunlap@oracle.com>
>> ---
>> 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
>>      </sect1>
>>      <sect1 id="PPC32_support"><title>PPC32 support</title>
>> -!Iarch/powerpc/kernel/rio.c
>> !Earch/powerpc/sysdev/fsl_rio.c
>> !Iarch/powerpc/sysdev/fsl_rio.c
>>      </sect1>
>
> 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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
  2008-04-30 19:01   ` Kumar Gala
@ 2008-04-30 19:12     ` Andrew Morton
  2008-04-30 20:31       ` Kumar Gala
       [not found]       ` <18456.60948.463017.139935@cargo.ozlabs.ibm.com>
  0 siblings, 2 replies; 11+ messages in thread
From: Andrew Morton @ 2008-04-30 19:12 UTC (permalink / raw)
  To: Kumar Gala
  Cc: rdunlap, linux-kernel, torvalds, mporter, paulus, benh, linuxppc-dev

On Wed, 30 Apr 2008 14:01:12 -0500
Kumar Gala <galak@kernel.crashing.org> wrote:

> 
> On Apr 30, 2008, at 1:35 PM, Andrew Morton wrote:
> > On Tue, 29 Apr 2008 20:10:55 -0700 (PDT)
> > "Randy.Dunlap" <rdunlap@xenotime.net> wrote:
> >
> >> From: Randy Dunlap <randy.dunlap@oracle.com>
> >>
> >> 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 <randy.dunlap@oracle.com>
> >> ---
> >> 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
> >>      </sect1>
> >>      <sect1 id="PPC32_support"><title>PPC32 support</title>
> >> -!Iarch/powerpc/kernel/rio.c
> >> !Earch/powerpc/sysdev/fsl_rio.c
> >> !Iarch/powerpc/sysdev/fsl_rio.c
> >>      </sect1>
> >
> > 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.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
  2008-04-30 19:12     ` Andrew Morton
@ 2008-04-30 20:31       ` Kumar Gala
       [not found]       ` <18456.60948.463017.139935@cargo.ozlabs.ibm.com>
  1 sibling, 0 replies; 11+ messages in thread
From: Kumar Gala @ 2008-04-30 20:31 UTC (permalink / raw)
  To: Andrew Morton
  Cc: rdunlap, linux-kernel, torvalds, mporter, paulus, benh, linuxppc-dev


On Apr 30, 2008, at 2:12 PM, Andrew Morton wrote:
> On Wed, 30 Apr 2008 14:01:12 -0500
> Kumar Gala <galak@kernel.crashing.org> wrote:
>
>>
>> On Apr 30, 2008, at 1:35 PM, Andrew Morton wrote:
>>> On Tue, 29 Apr 2008 20:10:55 -0700 (PDT)
>>> "Randy.Dunlap" <rdunlap@xenotime.net> wrote:
>>>
>>>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>>>
>>>> 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 <randy.dunlap@oracle.com>
>>>> ---
>>>> 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
>>>>     </sect1>
>>>>     <sect1 id="PPC32_support"><title>PPC32 support</title>
>>>> -!Iarch/powerpc/kernel/rio.c
>>>> !Earch/powerpc/sysdev/fsl_rio.c
>>>> !Iarch/powerpc/sysdev/fsl_rio.c
>>>>     </sect1>
>>>
>>> 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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
       [not found]       ` <18456.60948.463017.139935@cargo.ozlabs.ibm.com>
@ 2008-04-30 22:11         ` Randy Dunlap
  2008-04-30 22:14           ` Kumar Gala
  0 siblings, 1 reply; 11+ messages in thread
From: Randy Dunlap @ 2008-04-30 22:11 UTC (permalink / raw)
  To: Paul Mackerras
  Cc: Andrew Morton, Kumar Gala,
	"Zhang Wei" rdunlap@xenotime.net, linux-kernel, torvalds,
	mporter, benh, linuxppc-dev

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
  2008-04-30 22:11         ` Randy Dunlap
@ 2008-04-30 22:14           ` Kumar Gala
  2008-04-30 22:17             ` Randy Dunlap
  0 siblings, 1 reply; 11+ messages in thread
From: Kumar Gala @ 2008-04-30 22:14 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Paul Mackerras, Andrew Morton,
	"Zhang Wei" rdunlap@xenotime.net, linux-kernel, torvalds,
	mporter, benh, linuxppc-dev


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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] docbook: fix fatal rapidio yet again (and more to come)
  2008-04-30 22:14           ` Kumar Gala
@ 2008-04-30 22:17             ` Randy Dunlap
  2008-04-30 23:45               ` [PATCH] rapidio: fix current kernel-doc notation Randy Dunlap
  0 siblings, 1 reply; 11+ messages in thread
From: Randy Dunlap @ 2008-04-30 22:17 UTC (permalink / raw)
  To: Kumar Gala
  Cc: Paul Mackerras, Andrew Morton,
	"Zhang Wei" rdunlap@xenotime.net, linux-kernel, torvalds,
	mporter, benh, linuxppc-dev

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH] rapidio: fix current kernel-doc notation
  2008-04-30 22:17             ` Randy Dunlap
@ 2008-04-30 23:45               ` Randy Dunlap
  2008-05-01  3:57                 ` Kumar Gala
  0 siblings, 1 reply; 11+ messages in thread
From: Randy Dunlap @ 2008-04-30 23:45 UTC (permalink / raw)
  To: lkml
  Cc: Kumar Gala, Paul Mackerras, Andrew Morton, Wei.Zhang, torvalds,
	mporter, benh, linuxppc-dev

From: Randy Dunlap <randy.dunlap@oracle.com>

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 <randy.dunlap@oracle.com>
---
 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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] rapidio: fix current kernel-doc notation
  2008-04-30 23:45               ` [PATCH] rapidio: fix current kernel-doc notation Randy Dunlap
@ 2008-05-01  3:57                 ` Kumar Gala
  0 siblings, 0 replies; 11+ messages in thread
From: Kumar Gala @ 2008-05-01  3:57 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: lkml, Paul Mackerras, Andrew Morton, Wei.Zhang, torvalds,
	mporter, benh, linuxppc-dev


On Apr 30, 2008, at 6:45 PM, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> 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 <randy.dunlap@oracle.com>
> ---
> arch/powerpc/sysdev/fsl_rio.c |    9 +++++++--
> include/linux/rio.h           |    2 ++
> 2 files changed, 9 insertions(+), 2 deletions(-)

applied.

- k

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2008-05-01  3:59 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-30  3:10 [PATCH] docbook: fix fatal rapidio yet again (and more to come) Randy.Dunlap
2008-04-30 18:35 ` Andrew Morton
2008-04-30 18:48   ` Randy Dunlap
2008-04-30 19:01   ` Kumar Gala
2008-04-30 19:12     ` Andrew Morton
2008-04-30 20:31       ` Kumar Gala
     [not found]       ` <18456.60948.463017.139935@cargo.ozlabs.ibm.com>
2008-04-30 22:11         ` Randy Dunlap
2008-04-30 22:14           ` Kumar Gala
2008-04-30 22:17             ` Randy Dunlap
2008-04-30 23:45               ` [PATCH] rapidio: fix current kernel-doc notation Randy Dunlap
2008-05-01  3:57                 ` Kumar Gala

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).