Hi all, Changes since 20100503: Dropped trees: tmio-mmc (long unresolved conflicts and unable to fetch) hwlat (at the maintainer's request) The mem tree gained a conflict against the arm tree. The v4l-dvb tree lost its build failure and conflicts. The net tree lost its build failure. The crypto tree lost its conflict but gained another against the arm tree. The pcmcia tree gained a conflict against the wireless tree. The usb 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 162 trees (counting Linus' and 22 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 ...
drivers/media/video/vivi.c:1144: error: implicit declaration of function 'kfree' drivers/media/video/vivi.c:1156: error: implicit declaration of function 'kzalloc' drivers/media/video/vivi.c:1156: warning: assignment makes pointer from integer without a cast drivers/media/video/mem2mem_testdev.c:862: error: implicit declaration of function 'kzalloc' drivers/media/video/mem2mem_testdev.c:862: warning: assignment makes pointer from integer without a cast drivers/media/video/mem2mem_testdev.c:874: error: implicit declaration of function 'kfree' drivers/media/video/mem2mem_testdev.c:944: warning: assignment makes pointer from integer without a cast drivers/media/IR/rc-map.c:51: error: implicit declaration of function 'msleep' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** --
drivers/staging/dt3155v4l/dt3155v4l.c:73: error: implicit declaration of function 'udelay' drivers/staging/dt3155v4l/dt3155v4l.c:616: warning: assignment from incompatible pointer type drivers/staging/dt3155v4l/dt3155v4l.c:1270: error: implicit declaration of function 'msleep' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** --
Ick. What arch was this? thanks, greg k-h --
That is on x86_64. The config is attached. -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
It's my fault, sorry. Here is a patch solving the problem. Compiles with Randy's config, but does not link drivers/staging/built-in.o: In function `format_by_fourcc': (.text+0x211da): multiple definition of `format_by_fourcc' drivers/media/built-in.o:(.text+0x2a744): first defined here drivers/media/common/saa7146_video.c:struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc) drivers/staging/cx25821/cx25821-video.c:struct cx25821_fmt *format_by_fourcc(unsigned int fourcc) Marin MItov ========================================= [PATCH] Adding the missing linux/delay.h The prototypes of udelay() and msleep() are in linux/delay.h, so include it. Signed-off-by: Marin Mitov <firstname.lastname@example.org> ========================================================================== --- a/drivers/staging/dt3155v4l/dt3155v4l.c 2010-05-05 08:55:30.000000000 +0300 +++ b/drivers/staging/dt3155v4l/dt3155v4l.c 2010-05-05 08:57:00.000000000 +0300 @@ -4,6 +4,7 @@ #include <linux/pci.h> #include <linux/version.h> #include <linux/stringify.h> +#include <linux/delay.h> #include <media/videobuf-dma-contig.h> #include <linux/kthread.h> --
That's not your driver's problem :) I've queued up your patch, thanks. greg k-h --