Hi all,
As the merge window is open, please do not add 2.6.37 material to your
linux-next included trees until after 2.6.36-rc1.
Changes since 20100807:
The ext4 tree lost its conflicts.
The block tree gained a build failure so I used the version from
next-20100807.
The kgdb tree lost its conflicts and build failure.
The mfd tree gained a build failure so I used the version from
next-20100807.
The spi tree gained a conflict against the devicetree tree.
The workqueues tree lost its conflicts.
----------------------------------------------------------------------------
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 169 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 compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/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 kbuild-current/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/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 gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
Merging tegra/for-next
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
Merging avr32/avr32-arch
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/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
CONFLICT (content): Merge conflict in drivers/Makefile
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Applying: ceph: update for removal of request flag wrappers
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
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
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
Applying: v9fs: fixup for inode_setattr being removed
Applying: xfs: update tracing for clear_inode to evit_inode transition
Applying: cifs: fix for clear_inode -> evict_inode API change
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
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
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Makefile
CONFLICT (content): Merge conflict in include/xen/xen-ops.h
Merging ibft/master
Merging scsi/master
Merging async_tx/next
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/devices-db8500.c
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/Kconfig
CONFLICT (delete/modify): drivers/mtd/maps/redwood.c deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/maps/redwood.c left in tree.
$ git rm -f drivers/mtd/maps/redwood.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/um/drivers/hostaudio_kern.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying: nfs: update for module_param_named API change
Applying: AppArmor: update for module_param_named API change
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
$ git reset --hard HEAD^
Merging refs/next/20100807/block
Merging quilt/device-mapper
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/Kconfig
CONFLICT (content): Merge conflict in drivers/power/Makefile
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
$ git reset --hard HEAD^
Merging refs/next/20100807/mfd
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
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 quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/io.h
CONFLICT (content): Merge conflict in arch/arm/kernel/entry-armv.S
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging alacrity/linux-next
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging devicetree/next-devicetree
Merging spi/next-spi
CONFLICT (content): Merge conflict in drivers/spi/mpc512x_psc_spi.c
Applying: spi: update for of_device to platform_device replacement
Merging limits/writable_limits
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
CONFLICT (content): Merge conflict in include/asm-generic/unistd.h
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging tip/auto-latest
Merging lost-spurious-irq/lost-spurious-irq
CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c
CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c
CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c
CONFLICT (content): Merge conflict in include/linux/libata.h
Merging edac-amd/for-next
Merging oprofile/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
CONFLICT (content): Merge conflict in mm/memory-failure.c
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
Merging quilt/tty
CONFLICT (content): Merge conflict in drivers/char/vt.c
CONFLICT (content): Merge conflict in include/linux/serial_core.h
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
On Mon, 9 Aug 2010 13:23:14 +1000 Stephen Rothwell wrote:
> Hi all,
>
> As the merge window is open, please do not add 2.6.37 material to your
> linux-next included trees until after 2.6.36-rc1.
>
> Changes since 20100807:
ERROR: "svc_gss_principal" [fs/nfs/nfs.ko] undefined!
because in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5
and/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.
RPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed
by the fs/nfs[d]/Kconfig configs:
select SUNRPC_GSS
select CRYPTO
select CRYPTO_MD5
select CRYPTO_DES
select CRYPTO_CBC
Failing config is attached.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
From: Randy Dunlap <[email protected]>
The USB gadget webcam driver uses V4L2 interfaces, so it should depend
on VIDEO_V4L2 instead of VIDEO_DEV. This fixes a lot of build errors
when V4L2 is not enabled:
ERROR: "v4l2_event_unsubscribe" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_event_queue" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "video_device_release" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "video_usercopy" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_event_dequeue" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "video_register_device" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "video_device_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_event_subscribe" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "video_unregister_device" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_fh_init" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_event_pending" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_event_init" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "video_devdata" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_event_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_fh_add" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_fh_del" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_fh_exit" [drivers/usb/gadget/g_webcam.ko] undefined!
ERROR: "v4l2_ctrl_fill" [drivers/media/video/v4l2-common.ko] undefined!
ERROR: "v4l2_ctrl_get_menu" [drivers/media/video/v4l2-common.ko] undefined!
ERROR: "v4l2_device_unregister_subdev" [drivers/media/video/v4l2-common.ko] undefined!
ERROR: "v4l2_device_register_subdev" [drivers/media/video/v4l2-common.ko] undefined!
Signed-off-by: Randy Dunlap <[email protected]>
Cc: David Brownell <[email protected]>
---
drivers/usb/gadget/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20100809.orig/drivers/usb/gadget/Kconfig
+++ linux-next-20100809/drivers/usb/gadget/Kconfig
@@ -947,7 +947,7 @@ endif
# or video class gadget drivers), or specific hardware, here.
config USB_G_WEBCAM
tristate "USB Webcam Gadget"
- depends on VIDEO_DEV
+ depends on VIDEO_V4L2
help
The Webcam Gadget acts as a composite USB Audio and Video Class
device. It provides a userspace API to process UVC control requests
From: Randy Dunlap <[email protected]>
v4l2-ctrls.c needs to include slab.h to prevent build errors:
drivers/media/video/v4l2-ctrls.c:766: error: implicit declaration of function 'kzalloc'
drivers/media/video/v4l2-ctrls.c:786: error: implicit declaration of function 'kfree'
drivers/media/video/v4l2-ctrls.c:1528: error: implicit declaration of function 'kmalloc'
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
---
drivers/media/video/v4l2-ctrls.c | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20100809.orig/drivers/media/video/v4l2-ctrls.c
+++ linux-next-20100809/drivers/media/video/v4l2-ctrls.c
@@ -19,6 +19,7 @@
*/
#include <linux/ctype.h>
+#include <linux/slab.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
Hi Randy,
Thanks for the patch.
On Monday 09 August 2010 19:55:20 Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> The USB gadget webcam driver uses V4L2 interfaces, so it should depend
> on VIDEO_V4L2 instead of VIDEO_DEV. This fixes a lot of build errors
> when V4L2 is not enabled:
>
> ERROR: "v4l2_event_unsubscribe" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_event_queue" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "video_device_release" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "video_usercopy" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_event_dequeue" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "video_register_device" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "video_device_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_event_subscribe" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "video_unregister_device" [drivers/usb/gadget/g_webcam.ko]
> undefined!
> ERROR: "v4l2_fh_init" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_event_pending" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_event_init" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "video_devdata" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_event_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_fh_add" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_fh_del" [drivers/usb/gadget/g_webcam.ko] undefined!
> ERROR: "v4l2_fh_exit" [drivers/usb/gadget/g_webcam.ko] undefined!
All those symbols should be defined when VIDEO_DEV is selected.
> ERROR: "v4l2_ctrl_fill" [drivers/media/video/v4l2-common.ko] undefined!
> ERROR: "v4l2_ctrl_get_menu" [drivers/media/video/v4l2-common.ko] undefined!
Those 2 symbols require VIDEO_V4L2 but are not used by the webcam gadget
driver.
> ERROR: "v4l2_device_unregister_subdev" [drivers/media/video/v4l2-common.ko]
> undefined!
> ERROR: "v4l2_device_register_subdev" [drivers/media/video/v4l2-common.ko]
> undefined!
Those two symbols should be defined when VIDEO_DEV is selected. They are not
used by the webcam gadget driver.
--
Regards,
Laurent Pinchart
On 08/10/10 05:16, Laurent Pinchart wrote:
> Hi Randy,
>
> Thanks for the patch.
>
> On Monday 09 August 2010 19:55:20 Randy Dunlap wrote:
>> From: Randy Dunlap <[email protected]>
>>
>> The USB gadget webcam driver uses V4L2 interfaces, so it should depend
>> on VIDEO_V4L2 instead of VIDEO_DEV. This fixes a lot of build errors
>> when V4L2 is not enabled:
>>
>> ERROR: "v4l2_event_unsubscribe" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_event_queue" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "video_device_release" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "video_usercopy" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_event_dequeue" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "video_register_device" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "video_device_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_event_subscribe" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "video_unregister_device" [drivers/usb/gadget/g_webcam.ko]
>> undefined!
>> ERROR: "v4l2_fh_init" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_event_pending" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_event_init" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "video_devdata" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_event_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_fh_add" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_fh_del" [drivers/usb/gadget/g_webcam.ko] undefined!
>> ERROR: "v4l2_fh_exit" [drivers/usb/gadget/g_webcam.ko] undefined!
>
> All those symbols should be defined when VIDEO_DEV is selected.
>
>> ERROR: "v4l2_ctrl_fill" [drivers/media/video/v4l2-common.ko] undefined!
>> ERROR: "v4l2_ctrl_get_menu" [drivers/media/video/v4l2-common.ko] undefined!
>
> Those 2 symbols require VIDEO_V4L2 but are not used by the webcam gadget
> driver.
>
>> ERROR: "v4l2_device_unregister_subdev" [drivers/media/video/v4l2-common.ko]
>> undefined!
>> ERROR: "v4l2_device_register_subdev" [drivers/media/video/v4l2-common.ko]
>> undefined!
>
> Those two symbols should be defined when VIDEO_DEV is selected. They are not
> used by the webcam gadget driver.
>
Summary: I should drop this patch and look elsewhere for the problem,
Right?
Thanks for your help.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Hi Randy,
On Tuesday 10 August 2010 16:48:57 Randy Dunlap wrote:
> On 08/10/10 05:16, Laurent Pinchart wrote:
> > On Monday 09 August 2010 19:55:20 Randy Dunlap wrote:
> >> From: Randy Dunlap <[email protected]>
> >>
> >> The USB gadget webcam driver uses V4L2 interfaces, so it should depend
> >> on VIDEO_V4L2 instead of VIDEO_DEV. This fixes a lot of build errors
> >> when V4L2 is not enabled:
> >>
> >> ERROR: "v4l2_event_unsubscribe" [drivers/usb/gadget/g_webcam.ko]
> >> undefined! ERROR: "v4l2_event_queue" [drivers/usb/gadget/g_webcam.ko]
> >> undefined! ERROR: "video_device_release"
> >> [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_usercopy"
> >> [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_event_dequeue"
> >> [drivers/usb/gadget/g_webcam.ko] undefined! ERROR:
> >> "video_register_device" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "video_device_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_event_subscribe" [drivers/usb/gadget/g_webcam.ko]
> >> undefined! ERROR: "video_unregister_device"
> >> [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_fh_init" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_event_pending" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_event_init" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "video_devdata" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_event_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_fh_add" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_fh_del" [drivers/usb/gadget/g_webcam.ko] undefined!
> >> ERROR: "v4l2_fh_exit" [drivers/usb/gadget/g_webcam.ko] undefined!
> >
> > All those symbols should be defined when VIDEO_DEV is selected.
> >
> >> ERROR: "v4l2_ctrl_fill" [drivers/media/video/v4l2-common.ko] undefined!
> >> ERROR: "v4l2_ctrl_get_menu" [drivers/media/video/v4l2-common.ko]
> >> undefined!
> >
> > Those 2 symbols require VIDEO_V4L2 but are not used by the webcam gadget
> > driver.
> >
> >> ERROR: "v4l2_device_unregister_subdev"
> >> [drivers/media/video/v4l2-common.ko] undefined!
> >> ERROR: "v4l2_device_register_subdev"
> >> [drivers/media/video/v4l2-common.ko] undefined!
> >
> > Those two symbols should be defined when VIDEO_DEV is selected. They are
> > not used by the webcam gadget driver.
>
> Summary: I should drop this patch and look elsewhere for the problem,
> Right?
I think the problem comes from somewhere else, yes. Your patch won't hurt, but
I don't see how it could fix the problem either.
--
Regards,
Laurent Pinchart
On Mon, 2010-08-09 at 10:56 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
> v4l2-ctrls.c needs to include slab.h to prevent build errors:
This appears to have been missed. Running mainline git:
Linux amalthea 2.6.35-06998-g3d30701 #1 SMP Wed Aug 11 15:33:16 BST 2010
x86_64 Intel(R) Core(TM)2 Duo CPU T9400 @ 2.53GHz GenuineIntel GNU/Linux
Enabling Video 4 Linux results in the breakage promised by Randy:
> drivers/media/video/v4l2-ctrls.c:766: error: implicit declaration of function 'kzalloc'
> drivers/media/video/v4l2-ctrls.c:786: error: implicit declaration of function 'kfree'
> drivers/media/video/v4l2-ctrls.c:1528: error: implicit declaration of function 'kmalloc'
Please apply.
Regards,
--
Tony Vroon
UNIX systems administrator
London Internet Exchange Ltd, Trinity Court, Trinity Street,
Peterborough, PE1 1DA
Registered in England number 3137929
E-Mail: [email protected]
On Mon, 9 Aug 2010 10:08:56 -0700 Randy Dunlap wrote:
ping??
> On Mon, 9 Aug 2010 13:23:14 +1000 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > As the merge window is open, please do not add 2.6.37 material to your
> > linux-next included trees until after 2.6.36-rc1.
> >
> > Changes since 20100807:
>
>
> ERROR: "svc_gss_principal" [fs/nfs/nfs.ko] undefined!
>
>
> because in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5
> and/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.
>
> RPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed
> by the fs/nfs[d]/Kconfig configs:
>
> select SUNRPC_GSS
> select CRYPTO
> select CRYPTO_MD5
> select CRYPTO_DES
> select CRYPTO_CBC
>
>
> Failing config is attached.
> ---
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Thu, 2010-08-12 at 09:18 -0700, Randy Dunlap wrote:
> On Mon, 9 Aug 2010 10:08:56 -0700 Randy Dunlap wrote:
>
> ping??
Hi Randy,
I'm sorry. A heavy travel schedule is affecting my response time at the
moment. I'll try to take care of this by Tuesday (when I get back home)
if not before.
Cheers
Trond
> > On Mon, 9 Aug 2010 13:23:14 +1000 Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > As the merge window is open, please do not add 2.6.37 material to your
> > > linux-next included trees until after 2.6.36-rc1.
> > >
> > > Changes since 20100807:
> >
> >
> > ERROR: "svc_gss_principal" [fs/nfs/nfs.ko] undefined!
> >
> >
> > because in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5
> > and/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.
> >
> > RPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed
> > by the fs/nfs[d]/Kconfig configs:
> >
> > select SUNRPC_GSS
> > select CRYPTO
> > select CRYPTO_MD5
> > select CRYPTO_DES
> > select CRYPTO_CBC
> >
> >
> > Failing config is attached.
> > ---
>
>
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/12/10 10:31, Trond Myklebust wrote:
> On Thu, 2010-08-12 at 09:18 -0700, Randy Dunlap wrote:
>> On Mon, 9 Aug 2010 10:08:56 -0700 Randy Dunlap wrote:
>>
>> ping??
>
> Hi Randy,
>
> I'm sorry. A heavy travel schedule is affecting my response time at the
> moment. I'll try to take care of this by Tuesday (when I get back home)
> if not before.
No problem. Just wanted to make sure that it's not lost.
Thanks.
> Cheers
> Trond
>
>>> On Mon, 9 Aug 2010 13:23:14 +1000 Stephen Rothwell wrote:
>>>
>>>> Hi all,
>>>>
>>>> As the merge window is open, please do not add 2.6.37 material to your
>>>> linux-next included trees until after 2.6.36-rc1.
>>>>
>>>> Changes since 20100807:
>>>
>>>
>>> ERROR: "svc_gss_principal" [fs/nfs/nfs.ko] undefined!
>>>
>>>
>>> because in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5
>>> and/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.
>>>
>>> RPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed
>>> by the fs/nfs[d]/Kconfig configs:
>>>
>>> select SUNRPC_GSS
>>> select CRYPTO
>>> select CRYPTO_MD5
>>> select CRYPTO_DES
>>> select CRYPTO_CBC
>>>
>>>
>>> Failing config is attached.
>>> ---
>>
>>
>> ---
>> ~Randy
>> *** Remember to use Documentation/SubmitChecklist when testing your code ***
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On 08/10/10 07:53, Laurent Pinchart wrote:
> Hi Randy,
>
> On Tuesday 10 August 2010 16:48:57 Randy Dunlap wrote:
>> On 08/10/10 05:16, Laurent Pinchart wrote:
>>> On Monday 09 August 2010 19:55:20 Randy Dunlap wrote:
>>>> From: Randy Dunlap <[email protected]>
>>>>
>>>> The USB gadget webcam driver uses V4L2 interfaces, so it should depend
>>>> on VIDEO_V4L2 instead of VIDEO_DEV. This fixes a lot of build errors
>>>> when V4L2 is not enabled:
>>>>
>>>> ERROR: "v4l2_event_unsubscribe" [drivers/usb/gadget/g_webcam.ko]
>>>> undefined! ERROR: "v4l2_event_queue" [drivers/usb/gadget/g_webcam.ko]
>>>> undefined! ERROR: "video_device_release"
>>>> [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_usercopy"
>>>> [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_event_dequeue"
>>>> [drivers/usb/gadget/g_webcam.ko] undefined! ERROR:
>>>> "video_register_device" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "video_device_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_event_subscribe" [drivers/usb/gadget/g_webcam.ko]
>>>> undefined! ERROR: "video_unregister_device"
>>>> [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_fh_init" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_event_pending" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_event_init" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "video_devdata" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_event_alloc" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_fh_add" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_fh_del" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>> ERROR: "v4l2_fh_exit" [drivers/usb/gadget/g_webcam.ko] undefined!
>>>
>>> All those symbols should be defined when VIDEO_DEV is selected.
>>>
>>>> ERROR: "v4l2_ctrl_fill" [drivers/media/video/v4l2-common.ko] undefined!
>>>> ERROR: "v4l2_ctrl_get_menu" [drivers/media/video/v4l2-common.ko]
>>>> undefined!
>>>
>>> Those 2 symbols require VIDEO_V4L2 but are not used by the webcam gadget
>>> driver.
>>>
>>>> ERROR: "v4l2_device_unregister_subdev"
>>>> [drivers/media/video/v4l2-common.ko] undefined!
>>>> ERROR: "v4l2_device_register_subdev"
>>>> [drivers/media/video/v4l2-common.ko] undefined!
>>>
>>> Those two symbols should be defined when VIDEO_DEV is selected. They are
>>> not used by the webcam gadget driver.
>>
>> Summary: I should drop this patch and look elsewhere for the problem,
>> Right?
>
> I think the problem comes from somewhere else, yes. Your patch won't hurt, but
> I don't see how it could fix the problem either.
Agreed. Patch is withdrawn. Thanks.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Thu, 2010-08-12 at 10:36 -0700, Randy Dunlap wrote:
> On 08/12/10 10:31, Trond Myklebust wrote:
> > On Thu, 2010-08-12 at 09:18 -0700, Randy Dunlap wrote:
> >> On Mon, 9 Aug 2010 10:08:56 -0700 Randy Dunlap wrote:
> >>
> >> ping??
> >
> > Hi Randy,
> >
> > I'm sorry. A heavy travel schedule is affecting my response time at the
> > moment. I'll try to take care of this by Tuesday (when I get back home)
> > if not before.
>
> No problem. Just wanted to make sure that it's not lost.
Hi Randy,
How about the following fix?
Cheers
Trond
------------------------------------------------------------------------------------
Subject: [PATCH] NFS: Fix the selection of security flavours in Kconfig
From: Trond Myklebust <[email protected]>
Randy Dunlap reports:
ERROR: "svc_gss_principal" [fs/nfs/nfs.ko] undefined!
because in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5
and/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.
RPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed
by the fs/nfs[d]/Kconfig configs:
select SUNRPC_GSS
select CRYPTO
select CRYPTO_MD5
select CRYPTO_DES
select CRYPTO_CBC
Reported-by: Randy Dunlap <[email protected]>
Cc: J. Bruce Fields <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
---
fs/nfs/Kconfig | 1 -
fs/nfsd/Kconfig | 1 -
net/sunrpc/Kconfig | 9 +++++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index cc1bb33..2ddc384 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -63,7 +63,6 @@ config NFS_V3_ACL
config NFS_V4
bool "NFS client support for NFS version 4"
depends on NFS_FS
- select RPCSEC_GSS_KRB5
help
This option enables support for version 4 of the NFS protocol
(RFC 3530) in the kernel's NFS client.
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 503b9da..95932f5 100644
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -69,7 +69,6 @@ config NFSD_V4
depends on NFSD && PROC_FS && EXPERIMENTAL
select NFSD_V3
select FS_POSIX_ACL
- select RPCSEC_GSS_KRB5
help
This option enables support in your system's NFS server for
version 4 of the NFS protocol (RFC 3530).
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index 443c161..3376d76 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -18,10 +18,11 @@ config SUNRPC_XPRT_RDMA
If unsure, say N.
config RPCSEC_GSS_KRB5
- tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
- depends on SUNRPC && EXPERIMENTAL
+ tristate
+ depends on SUNRPC && CRYPTO
+ prompt "Secure RPC: Kerberos V mechanism" if !(NFS_V4 || NFSD_V4)
+ default y
select SUNRPC_GSS
- select CRYPTO
select CRYPTO_MD5
select CRYPTO_DES
select CRYPTO_CBC
@@ -34,7 +35,7 @@ config RPCSEC_GSS_KRB5
available from http://linux-nfs.org/. In addition, user-space
Kerberos support should be installed.
- If unsure, say N.
+ If unsure, say Y.
config RPCSEC_GSS_SPKM3
tristate "Secure RPC: SPKM3 mechanism (EXPERIMENTAL)"
On 08/17/10 14:23, Trond Myklebust wrote:
> On Thu, 2010-08-12 at 10:36 -0700, Randy Dunlap wrote:
>> On 08/12/10 10:31, Trond Myklebust wrote:
>>> On Thu, 2010-08-12 at 09:18 -0700, Randy Dunlap wrote:
>>>> On Mon, 9 Aug 2010 10:08:56 -0700 Randy Dunlap wrote:
>>>>
>>>> ping??
>>>
>>> Hi Randy,
>>>
>>> I'm sorry. A heavy travel schedule is affecting my response time at the
>>> moment. I'll try to take care of this by Tuesday (when I get back home)
>>> if not before.
>>
>> No problem. Just wanted to make sure that it's not lost.
>
> Hi Randy,
>
> How about the following fix?
Thanks, this fixes the build error.
Acked-by: Randy Dunlap <[email protected]>
> Cheers
> Trond
>
> ------------------------------------------------------------------------------------
> Subject: [PATCH] NFS: Fix the selection of security flavours in Kconfig
> From: Trond Myklebust <[email protected]>
>
> Randy Dunlap reports:
>
> ERROR: "svc_gss_principal" [fs/nfs/nfs.ko] undefined!
>
>
> because in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5
> and/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.
>
> RPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed
> by the fs/nfs[d]/Kconfig configs:
>
> select SUNRPC_GSS
> select CRYPTO
> select CRYPTO_MD5
> select CRYPTO_DES
> select CRYPTO_CBC
>
> Reported-by: Randy Dunlap <[email protected]>
> Cc: J. Bruce Fields <[email protected]>
> Signed-off-by: Trond Myklebust <[email protected]>
> ---
>
> fs/nfs/Kconfig | 1 -
> fs/nfsd/Kconfig | 1 -
> net/sunrpc/Kconfig | 9 +++++----
> 3 files changed, 5 insertions(+), 6 deletions(-)
>
>
> diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
> index cc1bb33..2ddc384 100644
> --- a/fs/nfs/Kconfig
> +++ b/fs/nfs/Kconfig
> @@ -63,7 +63,6 @@ config NFS_V3_ACL
> config NFS_V4
> bool "NFS client support for NFS version 4"
> depends on NFS_FS
> - select RPCSEC_GSS_KRB5
> help
> This option enables support for version 4 of the NFS protocol
> (RFC 3530) in the kernel's NFS client.
> diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
> index 503b9da..95932f5 100644
> --- a/fs/nfsd/Kconfig
> +++ b/fs/nfsd/Kconfig
> @@ -69,7 +69,6 @@ config NFSD_V4
> depends on NFSD && PROC_FS && EXPERIMENTAL
> select NFSD_V3
> select FS_POSIX_ACL
> - select RPCSEC_GSS_KRB5
> help
> This option enables support in your system's NFS server for
> version 4 of the NFS protocol (RFC 3530).
> diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
> index 443c161..3376d76 100644
> --- a/net/sunrpc/Kconfig
> +++ b/net/sunrpc/Kconfig
> @@ -18,10 +18,11 @@ config SUNRPC_XPRT_RDMA
> If unsure, say N.
>
> config RPCSEC_GSS_KRB5
> - tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
> - depends on SUNRPC && EXPERIMENTAL
> + tristate
> + depends on SUNRPC && CRYPTO
> + prompt "Secure RPC: Kerberos V mechanism" if !(NFS_V4 || NFSD_V4)
> + default y
> select SUNRPC_GSS
> - select CRYPTO
> select CRYPTO_MD5
> select CRYPTO_DES
> select CRYPTO_CBC
> @@ -34,7 +35,7 @@ config RPCSEC_GSS_KRB5
> available from http://linux-nfs.org/. In addition, user-space
> Kerberos support should be installed.
>
> - If unsure, say N.
> + If unsure, say Y.
>
> config RPCSEC_GSS_SPKM3
> tristate "Secure RPC: SPKM3 mechanism (EXPERIMENTAL)"
>
>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***