Hi all,
Changes since 20110607:
New trees: of-pci
l2-mtd
The staging.current tree gained a build failure so I used the version
from next-20110607.
The hid tree gained a build failure so I used the version from
next-20110607.
The net tree gained a build failure for which I applied a patch.
The sound-asoc tree lost its build failure.
The spi tree lost its build failure.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 194 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
$ git reset --hard HEAD^
Merging refs/next/20110607/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging of-pci/of-pci
Merging hid/for-next
$ git reset --hard HEAD^
Merging refs/next/20110607/hid
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging slave-dma/next
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging cpufreq-move/move-drivers
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
$ git rm -f drivers/mmc/host/sdhci-of-core.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging suspend/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
Merging tip/auto-latest
Merging rcu/rcu/next
CONFLICT (content): Merge conflict in kernel/rcutree.c
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
Merging bkl-config/config
Merging tmem/linux-next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
Applying: net: add needed interrupt.h
On Wed, 8 Jun 2011 16:10:46 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20110607:
Hi Mauro,
The DocBook/media/Makefile seems to be causing too much noise:
ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.gif: No such file or directory
ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.png: No such file or directory
Maybe the cleanmediadocs target could be made silent?
also, where is the mediaindexdocs target defined?
thanks,
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Hi Randy,
Em 08-06-2011 16:52, Randy Dunlap escreveu:
> On Wed, 8 Jun 2011 16:10:46 +1000 Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20110607:
>
>
> Hi Mauro,
>
> The DocBook/media/Makefile seems to be causing too much noise:
>
> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.gif: No such file or directory
> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.png: No such file or directory
>
> Maybe the cleanmediadocs target could be made silent?
I'll take a look on it.
FYI, The next build will probably be noisier, as it is now pointing to some
documentation gaps at the DVB API. Those gaps should take a longer time to fix,
as we need to discuss upstream about what should be done with those API's,
that seems to be abandoned upstream (only one legacy DVB driver uses them).
However, I was told that some out-of-tree drivers and some drivers under development
are using them.
So, I intend to wait until the next merge window before either dropping those
legacy API specs (or moving them to a deprecated section) or to merge those
out-of-tree drivers, with the proper documentation updates.
> also, where is the mediaindexdocs target defined?
Thanks for noticing it. We don't need this target anymore. I'll write a patch
removing it.
Cheers,
Mauro.
Em 09-06-2011 16:25, Mauro Carvalho Chehab escreveu:
> Em 08-06-2011 16:52, Randy Dunlap escreveu:
>> The DocBook/media/Makefile seems to be causing too much noise:
>>
>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.gif: No such file or directory
>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.png: No such file or directory
>>
>> Maybe the cleanmediadocs target could be made silent?
>
> I'll take a look on it.
>
> FYI, The next build will probably be noisier, as it is now pointing to some
> documentation gaps at the DVB API. Those gaps should take a longer time to fix,
> as we need to discuss upstream about what should be done with those API's,
> that seems to be abandoned upstream (only one legacy DVB driver uses them).
> However, I was told that some out-of-tree drivers and some drivers under development
> are using them.
>
> So, I intend to wait until the next merge window before either dropping those
> legacy API specs (or moving them to a deprecated section) or to merge those
> out-of-tree drivers, with the proper documentation updates.
>
>> also, where is the mediaindexdocs target defined?
>
> Thanks for noticing it. We don't need this target anymore. I'll write a patch
> removing it.
This patch should remove the undesired noise.
commit 75125b9d44456e0cf2d1fbb72ae33c13415299d1
Author: Mauro Carvalho Chehab <[email protected]>
Date: Thu Jun 9 16:34:29 2011 -0300
[media] DocBook: Don't be noisy at make cleanmediadocs
While here, remove the mediaindexdocs from PHONY.
Reported-by: Randy Dunlap <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index 1e909c2..b7627e1 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -21,10 +21,10 @@ MEDIA_TEMP = media-entities.tmpl \
IMGFILES := $(addprefix $(MEDIA_OBJ_DIR)/media/, $(notdir $(shell ls $(MEDIA_SRC_DIR)/*/*.gif $(MEDIA_SRC_DIR)/*/*.png)))
GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP))
-PHONY += cleanmediadocs mediaindexdocs
+PHONY += cleanmediadocs
cleanmediadocs:
- -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES)
+ -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES) 2>/dev/null
$(obj)/media_api.xml: $(GENFILES) FORCE
On 06/09/11 12:43, Mauro Carvalho Chehab wrote:
> Em 09-06-2011 16:25, Mauro Carvalho Chehab escreveu:
>> Em 08-06-2011 16:52, Randy Dunlap escreveu:
>>> The DocBook/media/Makefile seems to be causing too much noise:
>>>
>>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.gif: No such file or directory
>>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.png: No such file or directory
>>>
>>> Maybe the cleanmediadocs target could be made silent?
>>
>> I'll take a look on it.
>>
>> FYI, The next build will probably be noisier, as it is now pointing to some
>> documentation gaps at the DVB API. Those gaps should take a longer time to fix,
>> as we need to discuss upstream about what should be done with those API's,
>> that seems to be abandoned upstream (only one legacy DVB driver uses them).
>> However, I was told that some out-of-tree drivers and some drivers under development
>> are using them.
>>
>> So, I intend to wait until the next merge window before either dropping those
>> legacy API specs (or moving them to a deprecated section) or to merge those
>> out-of-tree drivers, with the proper documentation updates.
>>
>>> also, where is the mediaindexdocs target defined?
>>
>> Thanks for noticing it. We don't need this target anymore. I'll write a patch
>> removing it.
>
> This patch should remove the undesired noise.
Doesn't work for me. Did you test it?
Even this does not silence the noise for me:
cleanmediadocs:
-@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES) >/dev/null 2>&1
>
> commit 75125b9d44456e0cf2d1fbb72ae33c13415299d1
> Author: Mauro Carvalho Chehab <[email protected]>
> Date: Thu Jun 9 16:34:29 2011 -0300
>
> [media] DocBook: Don't be noisy at make cleanmediadocs
>
> While here, remove the mediaindexdocs from PHONY.
>
> Reported-by: Randy Dunlap <[email protected]>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
>
> diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
> index 1e909c2..b7627e1 100644
> --- a/Documentation/DocBook/media/Makefile
> +++ b/Documentation/DocBook/media/Makefile
> @@ -21,10 +21,10 @@ MEDIA_TEMP = media-entities.tmpl \
> IMGFILES := $(addprefix $(MEDIA_OBJ_DIR)/media/, $(notdir $(shell ls $(MEDIA_SRC_DIR)/*/*.gif $(MEDIA_SRC_DIR)/*/*.png)))
> GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP))
>
> -PHONY += cleanmediadocs mediaindexdocs
> +PHONY += cleanmediadocs
>
> cleanmediadocs:
> - -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES)
> + -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES) 2>/dev/null
>
> $(obj)/media_api.xml: $(GENFILES) FORCE
>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Em 09-06-2011 17:32, Randy Dunlap escreveu:
> On 06/09/11 12:43, Mauro Carvalho Chehab wrote:
>> Em 09-06-2011 16:25, Mauro Carvalho Chehab escreveu:
>>> Em 08-06-2011 16:52, Randy Dunlap escreveu:
>>>> The DocBook/media/Makefile seems to be causing too much noise:
>>>>
>>>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.gif: No such file or directory
>>>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.png: No such file or directory
>>>>
>>>> Maybe the cleanmediadocs target could be made silent?
>>>
>>> I'll take a look on it.
>>>
>>> FYI, The next build will probably be noisier, as it is now pointing to some
>>> documentation gaps at the DVB API. Those gaps should take a longer time to fix,
>>> as we need to discuss upstream about what should be done with those API's,
>>> that seems to be abandoned upstream (only one legacy DVB driver uses them).
>>> However, I was told that some out-of-tree drivers and some drivers under development
>>> are using them.
>>>
>>> So, I intend to wait until the next merge window before either dropping those
>>> legacy API specs (or moving them to a deprecated section) or to merge those
>>> out-of-tree drivers, with the proper documentation updates.
>>>
>>>> also, where is the mediaindexdocs target defined?
>>>
>>> Thanks for noticing it. We don't need this target anymore. I'll write a patch
>>> removing it.
>>
>> This patch should remove the undesired noise.
>
>
> Doesn't work for me. Did you test it?
Yes:
$ make htmldocs
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//v4l2.xml
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//media-entities.tmpl
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//media-indices.tmpl
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//videodev2.h.xml
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//audio.h.xml
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//ca.h.xml
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//dmx.h.xml
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//frontend.h.xml
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//net.h.xml
GEN /home/v4l/v4l/patchwork/Documentation/DocBook//video.h.xml
DOCPROC Documentation/DocBook/media_api.xml
HTML Documentation/DocBook/media_api.html
Error: no ID for constraint linkend: AUDIO_GET_PTS.
Error: no ID for constraint linkend: AUDIO_BILINGUAL_CHANNEL_SELECT.
Error: no ID for constraint linkend: CA_RESET.
Error: no ID for constraint linkend: CA_GET_CAP.
Error: no ID for constraint linkend: CA_GET_SLOT_INFO.
Error: no ID for constraint linkend: CA_GET_DESCR_INFO.
Error: no ID for constraint linkend: CA_GET_MSG.
Error: no ID for constraint linkend: CA_SEND_MSG.
Error: no ID for constraint linkend: CA_SET_DESCR.
Error: no ID for constraint linkend: CA_SET_PID.
Error: no ID for constraint linkend: DMX_GET_PES_PIDS.
Error: no ID for constraint linkend: DMX_GET_CAPS.
Error: no ID for constraint linkend: DMX_SET_SOURCE.
Error: no ID for constraint linkend: DMX_ADD_PID.
Error: no ID for constraint linkend: DMX_REMOVE_PID.
Error: no ID for constraint linkend: NET_ADD_IF.
Error: no ID for constraint linkend: NET_REMOVE_IF.
Error: no ID for constraint linkend: NET_GET_IF.
Error: no ID for constraint linkend: VIDEO_GET_SIZE.
Error: no ID for constraint linkend: VIDEO_GET_FRAME_RATE.
Error: no ID for constraint linkend: VIDEO_GET_PTS.
Error: no ID for constraint linkend: VIDEO_GET_FRAME_COUNT.
Error: no ID for constraint linkend: VIDEO_COMMAND.
Error: no ID for constraint linkend: VIDEO_TRY_COMMAND.
rm -rf Documentation/DocBook/index.html; echo '<h1>Linux Kernel HTML Documentation</h1>' >> Documentation/DocBook/index.html && echo '<h2>Kernel Version: 3.0.0-rc1</h2>' >> Documentation/DocBook/index.html && cat Documentation/DocBook/80211.html Documentation/DocBook/alsa-driver-api.html Documentation/DocBook/debugobjects.html Documentation/DocBook/device-drivers.html Documentation/DocBook/deviceiobook.html Documentation/DocBook/drm.html Documentation/DocBook/filesystems.html Documentation/DocBook/gadget.html Documentation/DocBook/genericirq.html Documentation/DocBook/kernel-api.html Documentation/DocBook/kernel-hacking.html Documentation/DocBook/kernel-locking.html Documentation/DocBook/kgdb.html Documentation/DocBook/libata.html Documentation/DocBook/librs.html Documentation/DocBook/lsm.html Documentation/DocBook/mcabook.html Documentation/DocBook/media_api.html Documentation/DocBook/mtdnand.html Documentation/DocBook/networking.html Documentation/DocBook/rapidio.html Docum
entation/DocBook/regulator.html Documentation/DocBook/s390-drivers.html Documentation/DocBook/scsi.html Documentation/DocBook/sh.html Documentation/DocBook/tracepoint.html Documentation/DocBook/uio-howto.html Documentation/DocBook/usb.html Documentation/DocBook/writing-an-alsa-driver.html Documentation/DocBook/writing_usb_driver.html Documentation/DocBook/z8530book.html >> Documentation/DocBook/index.html
v4l@pedra ~/v4l/patchwork $ make cleandocs
make[1]: [cleanmediadocs] Erro 1 (ignorado)
v4l@pedra ~/v4l/patchwork $ make cleanmediadocs
make[1]: [cleanmediadocs] Erro 1 (ignorado)
(the above linkend errors are due to the lack of documentation for those ioctls, as I've
explained before).
>
> Even this does not silence the noise for me:
>
> cleanmediadocs:
> -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES) >/dev/null 2>&1
Weird.
The errors should be doing to stderr, so 2>/dev/null should be working.
Mauro
On 06/09/11 16:32, Mauro Carvalho Chehab wrote:
> Em 09-06-2011 17:32, Randy Dunlap escreveu:
>> On 06/09/11 12:43, Mauro Carvalho Chehab wrote:
>>> Em 09-06-2011 16:25, Mauro Carvalho Chehab escreveu:
>>>> Em 08-06-2011 16:52, Randy Dunlap escreveu:
>>>>> The DocBook/media/Makefile seems to be causing too much noise:
>>>>>
>>>>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.gif: No such file or directory
>>>>> ls: cannot access linux-next-20110608/Documentation/DocBook/media/*/*.png: No such file or directory
>>>>>
>>>>> Maybe the cleanmediadocs target could be made silent?
>>>>
>>>> I'll take a look on it.
>>>>
>>>> FYI, The next build will probably be noisier, as it is now pointing to some
>>>> documentation gaps at the DVB API. Those gaps should take a longer time to fix,
>>>> as we need to discuss upstream about what should be done with those API's,
>>>> that seems to be abandoned upstream (only one legacy DVB driver uses them).
>>>> However, I was told that some out-of-tree drivers and some drivers under development
>>>> are using them.
>>>>
>>>> So, I intend to wait until the next merge window before either dropping those
>>>> legacy API specs (or moving them to a deprecated section) or to merge those
>>>> out-of-tree drivers, with the proper documentation updates.
>>>>
>>>>> also, where is the mediaindexdocs target defined?
>>>>
>>>> Thanks for noticing it. We don't need this target anymore. I'll write a patch
>>>> removing it.
>>>
>>> This patch should remove the undesired noise.
>>
>>
>> Doesn't work for me. Did you test it?
>
> Yes:
>
> $ make htmldocs
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//v4l2.xml
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//media-entities.tmpl
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//media-indices.tmpl
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//videodev2.h.xml
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//audio.h.xml
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//ca.h.xml
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//dmx.h.xml
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//frontend.h.xml
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//net.h.xml
> GEN /home/v4l/v4l/patchwork/Documentation/DocBook//video.h.xml
> DOCPROC Documentation/DocBook/media_api.xml
> HTML Documentation/DocBook/media_api.html
> Error: no ID for constraint linkend: AUDIO_GET_PTS.
> Error: no ID for constraint linkend: AUDIO_BILINGUAL_CHANNEL_SELECT.
> Error: no ID for constraint linkend: CA_RESET.
> Error: no ID for constraint linkend: CA_GET_CAP.
> Error: no ID for constraint linkend: CA_GET_SLOT_INFO.
> Error: no ID for constraint linkend: CA_GET_DESCR_INFO.
> Error: no ID for constraint linkend: CA_GET_MSG.
> Error: no ID for constraint linkend: CA_SEND_MSG.
> Error: no ID for constraint linkend: CA_SET_DESCR.
> Error: no ID for constraint linkend: CA_SET_PID.
> Error: no ID for constraint linkend: DMX_GET_PES_PIDS.
> Error: no ID for constraint linkend: DMX_GET_CAPS.
> Error: no ID for constraint linkend: DMX_SET_SOURCE.
> Error: no ID for constraint linkend: DMX_ADD_PID.
> Error: no ID for constraint linkend: DMX_REMOVE_PID.
> Error: no ID for constraint linkend: NET_ADD_IF.
> Error: no ID for constraint linkend: NET_REMOVE_IF.
> Error: no ID for constraint linkend: NET_GET_IF.
> Error: no ID for constraint linkend: VIDEO_GET_SIZE.
> Error: no ID for constraint linkend: VIDEO_GET_FRAME_RATE.
> Error: no ID for constraint linkend: VIDEO_GET_PTS.
> Error: no ID for constraint linkend: VIDEO_GET_FRAME_COUNT.
> Error: no ID for constraint linkend: VIDEO_COMMAND.
> Error: no ID for constraint linkend: VIDEO_TRY_COMMAND.
> rm -rf Documentation/DocBook/index.html; echo '<h1>Linux Kernel HTML Documentation</h1>' >> Documentation/DocBook/index.html && echo '<h2>Kernel Version: 3.0.0-rc1</h2>' >> Documentation/DocBook/index.html && cat Documentation/DocBook/80211.html Documentation/DocBook/alsa-driver-api.html Documentation/DocBook/debugobjects.html Documentation/DocBook/device-drivers.html Documentation/DocBook/deviceiobook.html Documentation/DocBook/drm.html Documentation/DocBook/filesystems.html Documentation/DocBook/gadget.html Documentation/DocBook/genericirq.html Documentation/DocBook/kernel-api.html Documentation/DocBook/kernel-hacking.html Documentation/DocBook/kernel-locking.html Documentation/DocBook/kgdb.html Documentation/DocBook/libata.html Documentation/DocBook/librs.html Documentation/DocBook/lsm.html Documentation/DocBook/mcabook.html Documentation/DocBook/media_api.html Documentation/DocBook/mtdnand.html Documentation/DocBook/networking.html Documentation/DocBook/rapidio.html Doc
um
> entation/DocBook/regulator.html Documentation/DocBook/s390-drivers.html Documentation/DocBook/scsi.html Documentation/DocBook/sh.html Documentation/DocBook/tracepoint.html Documentation/DocBook/uio-howto.html Documentation/DocBook/usb.html Documentation/DocBook/writing-an-alsa-driver.html Documentation/DocBook/writing_usb_driver.html Documentation/DocBook/z8530book.html >> Documentation/DocBook/index.html
> v4l@pedra ~/v4l/patchwork $ make cleandocs
> make[1]: [cleanmediadocs] Erro 1 (ignorado)
> v4l@pedra ~/v4l/patchwork $ make cleanmediadocs
> make[1]: [cleanmediadocs] Erro 1 (ignorado)
>
> (the above linkend errors are due to the lack of documentation for those ioctls, as I've
> explained before).
>
>>
>> Even this does not silence the noise for me:
>>
>> cleanmediadocs:
>> -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(IMGFILES) >/dev/null 2>&1
>
> Weird.
> The errors should be doing to stderr, so 2>/dev/null should be working.
Big hint: I see these errors not during "make htmldocs" but during a kernel code build
when CONFIG_BUILD_DOCSRC=y.
Sorry, I should have mentioned this earlier.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Hi Randy,
Em 09-06-2011 20:37, Randy Dunlap escreveu:
>
> Big hint: I see these errors not during "make htmldocs" but during a kernel code build
> when CONFIG_BUILD_DOCSRC=y.
>
> Sorry, I should have mentioned this earlier.
I couldn't reach any troubles there. Documentation build is stopping earlier.
I'm using the -next tree for 20110610:
$ make defconfig
$ make CONFIG_BUILD_DOCSRC=y -j 16 Documentation/
Documentation/networking/timestamping/timestamping.c:45:30: error: linux/net_tstamp.h: No such file or directory
Documentation/networking/timestamping/timestamping.c: In function ?main?:
Documentation/networking/timestamping/timestamping.c:331: error: storage size of ?hwconfig? isn?t known
Documentation/networking/timestamping/timestamping.c:331: error: storage size of ?hwconfig_requested? isn?t known
Documentation/networking/timestamping/timestamping.c:355: error: ?SOF_TIMESTAMPING_TX_HARDWARE? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:355: error: (Each undeclared identifier is reported only once
Documentation/networking/timestamping/timestamping.c:355: error: for each function it appears in.)
Documentation/networking/timestamping/timestamping.c:357: error: ?SOF_TIMESTAMPING_TX_SOFTWARE? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:359: error: ?SOF_TIMESTAMPING_RX_HARDWARE? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:361: error: ?SOF_TIMESTAMPING_RX_SOFTWARE? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:363: error: ?SOF_TIMESTAMPING_SOFTWARE? undeclared (first use in this function)
Documentation/accounting/getdelays.c: In function ?main?:
Documentation/networking/timestamping/timestamping.c:365: error: ?SOF_TIMESTAMPING_SYS_HARDWARE? undeclared (first use in this function)Documentation/accounting/getdelays.c:525: error: ?TASKSTATS_TYPE_NULL? undeclared (first use in this function)
Documentation/accounting/getdelays.c:525: error: (Each undeclared identifier is reported only once
Documentation/accounting/getdelays.c:525: error: for each function it appears in.)
Documentation/networking/timestamping/timestamping.c:367: error: ?SOF_TIMESTAMPING_RAW_HARDWARE? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:387: error: ?HWTSTAMP_TX_ON? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:387: error: ?HWTSTAMP_TX_OFF? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:390: error: ?HWTSTAMP_FILTER_PTP_V1_L4_SYNC? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:390: error: ?HWTSTAMP_FILTER_NONE? undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:331: warning: unused variable ?hwconfig_requested?
Documentation/networking/timestamping/timestamping.c:331: warning: unused variable ?hwconfig?
make[2]: *** [Documentation/accounting/getdelays] Error 1
make[3]: *** [Documentation/networking/timestamping/timestamping] Error 1
make[1]: *** [Documentation/accounting] Error 2
make[1]: *** Waiting for unfinished jobs....
make[2]: *** [Documentation/networking/timestamping] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Documentation/networking] Error 2
make: *** [Documentation/] Error 2
Could you please send me your .config?
Thanks,
Mauro
On 06/10/11 05:47, Mauro Carvalho Chehab wrote:
> Hi Randy,
>
> Em 09-06-2011 20:37, Randy Dunlap escreveu:
>>
>> Big hint: I see these errors not during "make htmldocs" but during a kernel code build
>> when CONFIG_BUILD_DOCSRC=y.
>>
>> Sorry, I should have mentioned this earlier.
>
> I couldn't reach any troubles there. Documentation build is stopping earlier.
> I'm using the -next tree for 20110610:
>
> $ make defconfig
> $ make CONFIG_BUILD_DOCSRC=y -j 16 Documentation/
Maybe that incantation does not set CONFIG_HEADERS_CHECK, which
CONFIG_BUILD_DOCSRC depends on.
[build errors snipped]
>
> Could you please send me your .config?
yes, attached.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Em 10-06-2011 12:04, Randy Dunlap escreveu:
> On 06/10/11 05:47, Mauro Carvalho Chehab wrote:
>> Hi Randy,
>>
>> Em 09-06-2011 20:37, Randy Dunlap escreveu:
>>>
>>> Big hint: I see these errors not during "make htmldocs" but during a kernel code build
>>> when CONFIG_BUILD_DOCSRC=y.
>>>
>>> Sorry, I should have mentioned this earlier.
>>
>> I couldn't reach any troubles there. Documentation build is stopping earlier.
>> I'm using the -next tree for 20110610:
>>
>> $ make defconfig
>> $ make CONFIG_BUILD_DOCSRC=y -j 16 Documentation/
>
>
> Maybe that incantation does not set CONFIG_HEADERS_CHECK, which
> CONFIG_BUILD_DOCSRC depends on.
>
> [build errors snipped]
>
>>
>> Could you please send me your .config?
>
> yes, attached.
>
Hmm... didn't work either. With your config:
[mchehab@buidmachine linux-next]$ make -j 16 Documentation/
CHK include/linux/version.h
CHK include/generated/utsrelease.h
CALL scripts/checksyscalls.sh
HOSTCC Documentation/networking/timestamping/timestamping
Documentation/networking/timestamping/timestamping.c:45:30: error: linux/net_tstamp.h: No such file or directory
Documentation/networking/timestamping/timestamping.c: In function ‘main’:
Documentation/networking/timestamping/timestamping.c:331: error: storage size of ‘hwconfig’ isn’t known
Documentation/networking/timestamping/timestamping.c:331: error: storage size of ‘hwconfig_requested’ isn’t known
Documentation/networking/timestamping/timestamping.c:355: error: ‘SOF_TIMESTAMPING_TX_HARDWARE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:355: error: (Each undeclared identifier is reported only once
Documentation/networking/timestamping/timestamping.c:355: error: for each function it appears in.)
Documentation/networking/timestamping/timestamping.c:357: error: ‘SOF_TIMESTAMPING_TX_SOFTWARE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:359: error: ‘SOF_TIMESTAMPING_RX_HARDWARE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:361: error: ‘SOF_TIMESTAMPING_RX_SOFTWARE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:363: error: ‘SOF_TIMESTAMPING_SOFTWARE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:365: error: ‘SOF_TIMESTAMPING_SYS_HARDWARE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:367: error: ‘SOF_TIMESTAMPING_RAW_HARDWARE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:387: error: ‘HWTSTAMP_TX_ON’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:387: error: ‘HWTSTAMP_TX_OFF’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:390: error: ‘HWTSTAMP_FILTER_PTP_V1_L4_SYNC’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:390: error: ‘HWTSTAMP_FILTER_NONE’ undeclared (first use in this function)
Documentation/networking/timestamping/timestamping.c:331: warning: unused variable ‘hwconfig_requested’
Documentation/networking/timestamping/timestamping.c:331: warning: unused variable ‘hwconfig’
make[3]: *** [Documentation/networking/timestamping/timestamping] Error 1
make[2]: *** [Documentation/networking/timestamping] Error 2
make[1]: *** [Documentation/networking] Error 2
make: *** [Documentation/] Error 2
PS.: A full build against next is broken:
$ make -j 27
CHK include/linux/version.h
CHK include/generated/utsrelease.h
CALL scripts/checksyscalls.sh
CHK include/generated/compile.h
CC arch/x86/lib/memmove_64.o
gcc: arch/x86/lib/memmove_64.c: No such file or directory
gcc: no input files
make[1]: *** [arch/x86/lib/memmove_64.o] Error 1
make: *** [arch/x86/lib] Error 2
make: *** Waiting for unfinished jobs....
My tree is on this commit:
commit c4c5f633751496147f2d846844aa084a1dbca0f4
Author: Stephen Rothwell <[email protected]>
Date: Fri Jun 10 16:17:26 2011 +1000
Add linux-next specific files for 20110610
On 06/10/11 08:19, Mauro Carvalho Chehab wrote:
> Em 10-06-2011 12:04, Randy Dunlap escreveu:
>> On 06/10/11 05:47, Mauro Carvalho Chehab wrote:
>>> Hi Randy,
>>>
>>> Em 09-06-2011 20:37, Randy Dunlap escreveu:
>>>>
>>>> Big hint: I see these errors not during "make htmldocs" but during a kernel code build
>>>> when CONFIG_BUILD_DOCSRC=y.
>>>>
>>>> Sorry, I should have mentioned this earlier.
>>>
>>> I couldn't reach any troubles there. Documentation build is stopping earlier.
>>> I'm using the -next tree for 20110610:
>>>
>>> $ make defconfig
>>> $ make CONFIG_BUILD_DOCSRC=y -j 16 Documentation/
>>
>>
>> Maybe that incantation does not set CONFIG_HEADERS_CHECK, which
>> CONFIG_BUILD_DOCSRC depends on.
>>
>> [build errors snipped]
>>
>>>
>>> Could you please send me your .config?
>>
>> yes, attached.
>>
>
> Hmm... didn't work either. With your config:
>
> [mchehab@buidmachine linux-next]$ make -j 16 Documentation/
> CHK include/linux/version.h
> CHK include/generated/utsrelease.h
> CALL scripts/checksyscalls.sh
> HOSTCC Documentation/networking/timestamping/timestamping
> Documentation/networking/timestamping/timestamping.c:45:30: error: linux/net_tstamp.h: No such file or directory
> Documentation/networking/timestamping/timestamping.c: In function ?main?:
> Documentation/networking/timestamping/timestamping.c:331: error: storage size of ?hwconfig? isn?t known
> Documentation/networking/timestamping/timestamping.c:331: error: storage size of ?hwconfig_requested? isn?t known
> Documentation/networking/timestamping/timestamping.c:355: error: ?SOF_TIMESTAMPING_TX_HARDWARE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:355: error: (Each undeclared identifier is reported only once
> Documentation/networking/timestamping/timestamping.c:355: error: for each function it appears in.)
> Documentation/networking/timestamping/timestamping.c:357: error: ?SOF_TIMESTAMPING_TX_SOFTWARE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:359: error: ?SOF_TIMESTAMPING_RX_HARDWARE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:361: error: ?SOF_TIMESTAMPING_RX_SOFTWARE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:363: error: ?SOF_TIMESTAMPING_SOFTWARE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:365: error: ?SOF_TIMESTAMPING_SYS_HARDWARE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:367: error: ?SOF_TIMESTAMPING_RAW_HARDWARE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:387: error: ?HWTSTAMP_TX_ON? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:387: error: ?HWTSTAMP_TX_OFF? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:390: error: ?HWTSTAMP_FILTER_PTP_V1_L4_SYNC? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:390: error: ?HWTSTAMP_FILTER_NONE? undeclared (first use in this function)
> Documentation/networking/timestamping/timestamping.c:331: warning: unused variable ?hwconfig_requested?
> Documentation/networking/timestamping/timestamping.c:331: warning: unused variable ?hwconfig?
> make[3]: *** [Documentation/networking/timestamping/timestamping] Error 1
> make[2]: *** [Documentation/networking/timestamping] Error 2
> make[1]: *** [Documentation/networking] Error 2
> make: *** [Documentation/] Error 2
>
> PS.: A full build against next is broken:
> $ make -j 27
> CHK include/linux/version.h
> CHK include/generated/utsrelease.h
> CALL scripts/checksyscalls.sh
> CHK include/generated/compile.h
> CC arch/x86/lib/memmove_64.o
> gcc: arch/x86/lib/memmove_64.c: No such file or directory
> gcc: no input files
> make[1]: *** [arch/x86/lib/memmove_64.o] Error 1
> make: *** [arch/x86/lib] Error 2
> make: *** Waiting for unfinished jobs....
>
> My tree is on this commit:
>
> commit c4c5f633751496147f2d846844aa084a1dbca0f4
> Author: Stephen Rothwell <[email protected]>
> Date: Fri Jun 10 16:17:26 2011 +1000
>
> Add linux-next specific files for 20110610
Still fails on linux-next-20110610 for me.
Please try a full, clean build, not using only
$ make -j 16 Documentation/
$ mkdir doc64
$ cp -a config-r7970 doc64/.config
$ make O=doc64 oldconfig
$ make O=doc64 -j9 all
...
ls: cannot access /lnx/src/NEXT/linux-next-20110610/Documentation/DocBook/media/*/*.gif: No such file or directory
ls: cannot access /lnx/src/NEXT/linux-next-20110610/Documentation/DocBook/media/*/*.png: No such file or directory
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Hi Mauro,
On Fri, 10 Jun 2011 12:19:12 -0300 Mauro Carvalho Chehab <[email protected]> wrote:
>
> PS.: A full build against next is broken:
> $ make -j 27
> CHK include/linux/version.h
> CHK include/generated/utsrelease.h
> CALL scripts/checksyscalls.sh
> CHK include/generated/compile.h
> CC arch/x86/lib/memmove_64.o
> gcc: arch/x86/lib/memmove_64.c: No such file or directory
> gcc: no input files
Was that a build starting from a clean (object) tree?
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/