DOCPROC Documentation/DocBook/device-drivers.xml
docproc: .//include/linux/i2o.h: No such file or directory
make[1]: *** [Documentation/DocBook/device-drivers.xml] Error 1
Hi Jim,
On Tue, 10 Feb 2015 11:40:23 -0700 Jim Davis <[email protected]> wrote:
>
> DOCPROC Documentation/DocBook/device-drivers.xml
> docproc: .//include/linux/i2o.h: No such file or directory
> make[1]: *** [Documentation/DocBook/device-drivers.xml] Error 1
Presumably caused by commit 2cbf7fe2d5d3 ("i2o: move to staging") from
the staging tree.
--
Cheers,
Stephen Rothwell [email protected]
On Wed, 2015-02-11 at 07:27 +1100, Stephen Rothwell wrote:
> Hi Jim,
>
> On Tue, 10 Feb 2015 11:40:23 -0700 Jim Davis <[email protected]> wrote:
> >
> > DOCPROC Documentation/DocBook/device-drivers.xml
> > docproc: .//include/linux/i2o.h: No such file or directory
> > make[1]: *** [Documentation/DocBook/device-drivers.xml] Error 1
>
> Presumably caused by commit 2cbf7fe2d5d3 ("i2o: move to staging") from
> the staging tree.
Yep - I sent GregKH a fix.
Alan
On Wed, Feb 11, 2015 at 02:19:00PM +0000, Alan Cox wrote:
> On Wed, 2015-02-11 at 07:27 +1100, Stephen Rothwell wrote:
> > Hi Jim,
> >
> > On Tue, 10 Feb 2015 11:40:23 -0700 Jim Davis <[email protected]> wrote:
> > >
> > > DOCPROC Documentation/DocBook/device-drivers.xml
> > > docproc: .//include/linux/i2o.h: No such file or directory
> > > make[1]: *** [Documentation/DocBook/device-drivers.xml] Error 1
> >
> > Presumably caused by commit 2cbf7fe2d5d3 ("i2o: move to staging") from
> > the staging tree.
>
> Yep - I sent GregKH a fix.
You did? Did I apply it? I don't see it in my to-apply queue
anywhere...
Care to resend?
thanks,
greg k-h
On Thu, Feb 12, 2015 at 12:48 AM, Greg Kroah-Hartman
<[email protected]> wrote:
> On Wed, Feb 11, 2015 at 02:19:00PM +0000, Alan Cox wrote:
>> On Wed, 2015-02-11 at 07:27 +1100, Stephen Rothwell wrote:
>> > Hi Jim,
>> >
>> > On Tue, 10 Feb 2015 11:40:23 -0700 Jim Davis <[email protected]> wrote:
>> > >
>> > > DOCPROC Documentation/DocBook/device-drivers.xml
>> > > docproc: .//include/linux/i2o.h: No such file or directory
>> > > make[1]: *** [Documentation/DocBook/device-drivers.xml] Error 1
>> >
>> > Presumably caused by commit 2cbf7fe2d5d3 ("i2o: move to staging") from
>> > the staging tree.
>>
>> Yep - I sent GregKH a fix.
>
> You did? Did I apply it? I don't see it in my to-apply queue
> anywhere...
>
> Care to resend?
>
This warning started to appear on Linus's tree, after staging pull
request was merged.
Regards,
Masanari Iida
On Mon, 2015-02-16 at 11:29 +0900, Masanari Iida wrote:
> On Thu, Feb 12, 2015 at 12:48 AM, Greg Kroah-Hartman
> <[email protected]> wrote:
> > On Wed, Feb 11, 2015 at 02:19:00PM +0000, Alan Cox wrote:
> >> On Wed, 2015-02-11 at 07:27 +1100, Stephen Rothwell wrote:
> >> > Hi Jim,
> >> >
> >> > On Tue, 10 Feb 2015 11:40:23 -0700 Jim Davis <[email protected]> wrote:
> >> > >
> >> > > DOCPROC Documentation/DocBook/device-drivers.xml
> >> > > docproc: .//include/linux/i2o.h: No such file or directory
> >> > > make[1]: *** [Documentation/DocBook/device-drivers.xml] Error 1
> >> >
> >> > Presumably caused by commit 2cbf7fe2d5d3 ("i2o: move to staging") from
> >> > the staging tree.
> >>
> >> Yep - I sent GregKH a fix.
> >
> > You did? Did I apply it? I don't see it in my to-apply queue
> > anywhere...
> >
> > Care to resend?
> >
>
> This warning started to appear on Linus's tree, after staging pull
> request was merged.
I sent GregKH a fix for it a while ago
On Mon, 16 Feb 2015 16:21:30 +0000
Alan Cox <[email protected]> wrote:
> > This warning started to appear on Linus's tree, after staging pull
> > request was merged.
>
> I sent GregKH a fix for it a while ago
He seemed to indicate that he doesn't have it. The following would seem
to fit the bill; unless somebody objects I'll send it upward so that docs
builds start working again.
Thanks,
jon
>From a984e29fbe72371b203c43a33b66df44b4c8a948 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <[email protected]>
Date: Mon, 16 Feb 2015 12:21:42 -0700
Subject: [PATCH] Fix docs build failure caused by i2o removal
The movement of the I2O tree into staging broke the DocBook build. Rather
than redirect the i2o references into staging, it seems better to just
remove them since this code is on its way out anyway.
Signed-off-by: Jonathan Corbet <[email protected]>
---
Documentation/DocBook/device-drivers.tmpl | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index f2130586ef5d..faf09d4a0ea8 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -190,23 +190,6 @@ X!Edrivers/pnp/system.c
!Idrivers/message/fusion/mptfc.c
!Idrivers/message/fusion/mptlan.c
</sect1>
- <sect1><title>I2O message devices</title>
-!Iinclude/linux/i2o.h
-!Idrivers/message/i2o/core.h
-!Edrivers/message/i2o/iop.c
-!Idrivers/message/i2o/iop.c
-!Idrivers/message/i2o/config-osm.c
-!Edrivers/message/i2o/exec-osm.c
-!Idrivers/message/i2o/exec-osm.c
-!Idrivers/message/i2o/bus-osm.c
-!Edrivers/message/i2o/device.c
-!Idrivers/message/i2o/device.c
-!Idrivers/message/i2o/driver.c
-!Idrivers/message/i2o/pci.c
-!Idrivers/message/i2o/i2o_block.c
-!Idrivers/message/i2o/i2o_scsi.c
-!Idrivers/message/i2o/i2o_proc.c
- </sect1>
</chapter>
<chapter id="snddev">
--
2.1.0
On Mon, Feb 16, 2015 at 12:25:04PM -0700, Jonathan Corbet wrote:
> On Mon, 16 Feb 2015 16:21:30 +0000
> Alan Cox <[email protected]> wrote:
>
> > > This warning started to appear on Linus's tree, after staging pull
> > > request was merged.
> >
> > I sent GregKH a fix for it a while ago
>
> He seemed to indicate that he doesn't have it. The following would seem
> to fit the bill; unless somebody objects I'll send it upward so that docs
> builds start working again.
I got the second patch, but it was too late for my first round of
patches to send to Linus. Feel free to send this on yourself as I'm
going to be at a conference all this week and have limited time to do
this.
thanks,
greg k-h
On Mon, Feb 16, 2015 at 12:25:04PM -0700, Jonathan Corbet wrote:
> On Mon, 16 Feb 2015 16:21:30 +0000
> Alan Cox <[email protected]> wrote:
>
> > > This warning started to appear on Linus's tree, after staging pull
> > > request was merged.
> >
> > I sent GregKH a fix for it a while ago
>
> He seemed to indicate that he doesn't have it. The following would seem
> to fit the bill; unless somebody objects I'll send it upward so that docs
> builds start working again.
>
> Thanks,
>
> jon
>
> From a984e29fbe72371b203c43a33b66df44b4c8a948 Mon Sep 17 00:00:00 2001
> From: Jonathan Corbet <[email protected]>
> Date: Mon, 16 Feb 2015 12:21:42 -0700
> Subject: [PATCH] Fix docs build failure caused by i2o removal
>
> The movement of the I2O tree into staging broke the DocBook build. Rather
> than redirect the i2o references into staging, it seems better to just
> remove them since this code is on its way out anyway.
>
> Signed-off-by: Jonathan Corbet <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>