linux-next: Tree for December 4
Subsystems (6)
Hi all,
My usual call for calm: please do not put stuff destined for 2.6.34 into linux-next trees until after 2.6.33-rc1.
Changes since 20091203:
The ext3 tree lost its build failure.
The nfs tree gained a build failure so I used the version from next-20091203.
The block tree gained a build failure so I used the version from next-20091203.
The pcmcia tree gained a conflict against the net tree.
The irda tree gained a conflict against the net tree.
The limits tree gained conflicts against the net and fsnotify trees.
The tip tree gained a conflict against the limits tree.
The sysctl tree gained 2 conflicts against the net tree.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://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 155 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.
Signature · 244 lines
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/for-linus 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 arm/devel Merging davinci/davinci-next Merging msm/for-next Merging omap/for-next CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile Merging pxa/for-next Merging samsung/next-samsung CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging avr32/avr32-arch CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next CONFLICT (content): Merge conflict in arch/m68k/include/asm/ptrace.h Merging microblaze/next CONFLICT (content): Merge conflict in drivers/serial/of_serial.c Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/Kconfig CONFLICT (content): Merge conflict in arch/mips/Makefile CONFLICT (content): Merge conflict in arch/mips/include/asm/ftrace.h CONFLICT (add/add): Merge conflict in arch/mips/kernel/ftrace.c CONFLICT (add/add): Merge conflict in arch/mips/kernel/mcount.S CONFLICT (content): Merge conflict in scripts/recordmcount.pl Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging ceph/for-next Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next Merging ext3/for_next CONFLICT (content): Merge conflict in fs/cifs/dir.c Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging logfs/master Merging nfs/linux-next $ git reset --hard HEAD^ Merging refs/next/20091203/nfs Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next CONFLICT (add/add): Merge conflict in fs/9p/cache.c Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc 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 CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c Merging ieee1394/for-next CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-1394.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-fw.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv.h Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (delete/modify): net/wireless/wext.c deleted in net/master and modified in HEAD. Version HEAD of net/wireless/wext.c left in tree. $ git rm -f net/wireless/wext.c Applying: wext: merg fixup Merging wireless/master Applying: wireless: fix for mismerge Merging mtd/master CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c CONFLICT (delete/modify): drivers/mtd/nand/excite_nandflash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/nand/excite_nandflash.c left in tree. CONFLICT (content): Merge conflict in drivers/mtd/nand/pxa3xx_nand.c $ git rm -f drivers/mtd/nand/excite_nandflash.c Merging crypto/master Merging sound/for-next Merging cpufreq/next CONFLICT (content): Merge conflict in include/acpi/processor.h Merging quilt/rr CONFLICT (content): Merge conflict in arch/arm/kernel/vmlinux.lds.S Applying: modpost: autoconf.h has moved to include/generated Merging mmc/next Merging tmio-mmc/linux-next Merging input/next Merging lsm/for-next Merging block/for-next $ git reset --hard HEAD^ Merging refs/next/20091203/block Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c CONFLICT (content): Merge conflict in drivers/net/pcmcia/fmvj18x_cs.c CONFLICT (content): Merge conflict in drivers/net/pcmcia/nmclan_cs.c CONFLICT (content): Merge conflict in drivers/net/pcmcia/xirc2ps_cs.c CONFLICT (content): Merge conflict in drivers/net/wireless/ray_cs.c CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile CONFLICT (content): Merge conflict in drivers/pcmcia/sa1100_h3600.c Merging battery/master Merging leds/for-mm Merging backlight/for-mm CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.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 voltage/for-next CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile Merging security-testing/next CONFLICT (content): Merge conflict in Documentation/dontdiff 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 CONFLICT (content): Merge conflict in Documentation/video4linux/gspca.txt CONFLICT (content): Merge conflict in drivers/md/dm-crypt.c Merging audit/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next 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 fs/afs/write.c CONFLICT (content): Merge conflict in fs/cifs/dir.c CONFLICT (content): Merge conflict in fs/ubifs/file.c CONFLICT (content): Merge conflict in include/asm-generic/fcntl.h CONFLICT (content): Merge conflict in net/compat.c CONFLICT (content): Merge conflict in net/socket.c Merging irda/for-next CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Merging hwlat/for-linus CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging drbd/for-jens Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Applying: i7core_edac: do not export static functions Merging devicetree/next-devicetree Merging spi/next-spi 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 Merging omap_dss2/for-next Merging tip/auto-latest CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c CONFLICT (content): Merge conflict in kernel/irq/chip.c CONFLICT (content): Merge conflict in kernel/printk.c CONFLICT (content): Merge conflict in kernel/signal.c CONFLICT (content): Merge conflict in scripts/recordmcount.pl Merging edac-amd/for-next Merging oprofile/for-next Merging percpu/for-next CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hvCall.S CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c CONFLICT (content): Merge conflict in kernel/softlockup.c CONFLICT (content): Merge conflict in mm/slab.c Applying: percpu: merge fixup for variable renaming Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging sysctl/master CONFLICT (content): Merge conflict in kernel/sysctl_check.c CONFLICT (content): Merge conflict in net/ipv4/sysctl_net_ipv4.c CONFLICT (content): Merge conflict in net/ipv6/addrconf.c CONFLICT (content): Merge conflict in net/sctp/sysctl.c Merging quilt/driver-core Merging quilt/tty Merging quilt/usb CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Makefile Merging quilt/staging CONFLICT (content): Merge conflict in drivers/staging/Kconfig CONFLICT (content): Merge conflict in drivers/staging/Makefile CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc_cs.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_mio_cs.c Merging scsi-post-merge/master
Quoted 61 lines · Stephen Rothwell
Hi all,
My usual call for calm: please do not put stuff destined for 2.6.34 into linux-next trees until after 2.6.33-rc1.
Changes since 20091203:
The ext3 tree lost its build failure.
The nfs tree gained a build failure so I used the version from next-20091203.
The block tree gained a build failure so I used the version from next-20091203.
The pcmcia tree gained a conflict against the net tree.
The irda tree gained a conflict against the net tree.
The limits tree gained conflicts against the net and fsnotify trees.
The tip tree gained a conflict against the limits tree.
The sysctl tree gained 2 conflicts against the net tree.
----------------------------------------------------------------------------
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_defconfigfor powerpc and an allmodconfig forx86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit),ppc44x_defconfigand allyesconfig (minusCONFIG_PROFILE_ALL_BRANCHES- this fails its final link) and i386, sparc and sparc64 defconfig. These builds also haveCONFIG_ENABLE_WARN_DEPRECATED,CONFIG_ENABLE_MUST_CHECKandCONFIG_DEBUG_INFOdisabled when necessary.Below is a summary of the state of the merge.
We are up to 155 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.
Quoted 7 lines
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.Merging microblaze/next
CONFLICT (content): Merge conflict indrivers/serial/of_serial.c
I removed that my first patch from my next branch - it is in tty tree.
Michal
Signature · 3 lines
Michal Simek, Ing. (M.Eng) PetaLogix - Linux Solutions for a Reconfigurable World w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663
Hi Michal,
Quoted 5 lines · On Fri, 04 Dec 2009 10:44:28 +0100 Michal Simek <[email protected]>…
Quoted 3 lines
Merging microblaze/next
CONFLICT (content): Merge conflict indrivers/serial/of_serial.cI removed that my first patch from my next branch - it is in tty tree.
Thanks.
It is actually in Linus' tree now.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 1/1 media/miro: fix kconfig depends/select
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
miropcm20 uses ALSA (snd_) interfaces from the SND_MIRO driver, so it should depend on SND.
(selecting SND_MIRO when CONFIG_SND is not enabled is a problem.)
drivers/built-in.o: In function `vidioc_s_ctrl':
radio-miropcm20.c:(.text+0x227499): undefined reference to snd_aci_cmd' drivers/built-in.o: In function vidioc_s_frequency':
radio-miropcm20.c:(.text+0x227574): undefined reference to snd_aci_cmd' radio-miropcm20.c:(.text+0x227588): undefined reference to snd_aci_cmd' drivers/built-in.o: In function `pcm20_init':
radio-miropcm20.c:(.init.text+0x2a784): undefined reference to `snd_aci_get_aci'
miropcm20 selects SND_MIRO but SND_ISA may be not enabled, so also select SND_ISA so that the snd-miro driver will be built. Otherwise there are missing symbols:
ERROR: "snd_opl4_create" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_pcm" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_timer" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_create" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_mixer" [sound/isa/opti9xx/snd-miro.ko] undefined!
--- drivers/media/radio/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/radio/Kconfig +2 -1
@@ -197,7 +197,8 @@ config RADIO_MAESTRO config RADIO_MIROPCM20 tristate "miroSOUND PCM20 radio" - depends on ISA && VIDEO_V4L2 + depends on ISA && VIDEO_V4L2 && SND + select SND_ISA select SND_MIRO ---help--- Choose Y here if you have this FM radio card. You also need to enable
Re: linux-next: Tree for December 4 (staging/iio)
In reply to Stephen RothwellQuoted 6 lines · On Fri, 4 Dec 2009 20:30:14 +1100 Stephen Rothwell wrote:
Hi all,
My usual call for calm: please do not put stuff destined for 2.6.34 into linux-next trees until after 2.6.33-rc1.
Changes since 20091203:
There are still iio build errors due to expecting both ring buffer & software ring buffer interfaces to be available when they are not:
drivers/staging/iio/accel/lis3l02dq_ring.c: In function 'lis3l02dq_unconfigure_ring':drivers/staging/iio/accel/lis3l02dq_ring.c:535: error: implicit declaration of function 'iio_sw_rb_free' drivers/staging/iio/accel/lis3l02dq_ring.c: In function 'lis3l02dq_configure_ring':drivers/staging/iio/accel/lis3l02dq_ring.c:553: error: implicit declaration of function 'iio_sw_rb_allocate' drivers/staging/iio/accel/lis3l02dq_ring.c:553: warning: assignment makes pointer from integer without a cast make[5]: *** [drivers/staging/iio/accel/lis3l02dq_ring.o] Error 1
Failing config is attached. Please fix this.
---
~Randy
PATCH 1/1 Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed
---
Thanks to Randy for the report. Sorry for the slow response. I've been meaning to carefully check for any remaining cases like this.
Here I've kept the selection of IIO_SW_RING separate from IIO_TRIGGER as it will go away fairly shortly when the ring buffer type becomes configurable on a per device basis, whereas the IIO_TRIGGER select will remain. Whether to retain the option to remove the support for ring buffers entirely is one for after that support is in place.
Touch wood I think this is the last one, but I'll try a selection of unusual combinations now and post others as replies to this email.
drivers/staging/iio/accel/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/staging/iio/accel/Kconfig +1 -0
@@ -14,6 +14,7 @@ config LIS3L02DQ tristate "ST Microelectronics LIS3L02DQ Accelerometer Driver" depends on SPI select IIO_TRIGGER if IIO_RING_BUFFER + select IIO_SW_RING if IIO_RING_BUFFER help Say yes here to build SPI support for the ST microelectronics accelerometer. The driver supplies direct access via sysfs files
Signature · 1 line
1.6.4.4
Re: [PATCH] Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed
Quoted 2 lines · Jonathan Cameron
Signed-off-by Jonathan Cameron <[email protected]>Reported-by Randy Dunlap <[email protected]>
Thanks.
Quoted 30 lines
---
Thanks to Randy for the report. Sorry for the slow response. I've been meaning to carefully check for any remaining cases like this.
Here I've kept the selection ofIIO_SW_RINGseparate fromIIO_TRIGGERas it will go away fairly shortly when the ring buffer type becomes configurable on a per device basis, whereas theIIO_TRIGGERselect will remain. Whether to retain the option to remove the support for ring buffers entirely is one for after that support is in place.Touch wood I think this is the last one, but I'll try a selection of unusual combinations now and post others as replies to this email.
drivers/staging/iio/accel/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/staging/iio/accel/Kconfig +1
-0@@ -14,6 +14,7 @@ config LIS3L02DQ tristate "ST Microelectronics LIS3L02DQ Accelerometer Driver" depends on SPI select IIO_TRIGGER if IIO_RING_BUFFER + select IIO_SW_RING if IIO_RING_BUFFER help Say yes here to build SPI support for the ST microelectronics accelerometer. The driver supplies direct access via sysfs files
Signature · 1 line
~Randy
PATCH RESEND 1/1 staging: vt6x depends on WLAN
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
The vt665[56] drivers can be built when CONFIG_NET=n & CONFIG_NETDEVICES=n or just when CONFIG_WLAN=n. This leads to build failures.
Prevent this by making them depend on WLAN.
--- drivers/staging/vt6655/Kconfig | 2 +- drivers/staging/vt6656/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vt6655/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6655 tristate "VIA Technologies VT6655 support" - depends on PCI + depends on PCI && WLAN select WIRELESS_EXT select WEXT_PRIV ---help---
drivers/staging/vt6656/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6656 tristate "VIA Technologies VT6656 support" - depends on USB + depends on USB && WLAN select WIRELESS_EXT select WEXT_PRIV ---help---
[email protected]
Appliedpatch staging-vt6x-depends-on-wlan.patch added to gregkh-2.6 tree
This is a note to let you know that I've just added the patch titled
Subject: Staging: vt6x depends on WLAN
to my gregkh-2.6 tree. Its filename is
staging-vt6x-depends-on-wlan.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Quoted 1 line
From [email protected] Mon Dec 7 16:25:39 2009
From: Randy Dunlap <[email protected]>
Date: Sun, 6 Dec 2009 10:00:55 -0800
Subject: Staging: vt6x depends on WLAN
To: Stephen Rothwell <[email protected]>, [email protected]
Cc: [email protected], LKML <[email protected]>
Message-ID: <[email protected]>
From: Randy Dunlap <[email protected]>
The vt665[56] drivers can be built when CONFIG_NET=n & CONFIG_NETDEVICES=n or just when CONFIG_WLAN=n. This leads to build failures.
Prevent this by making them depend on WLAN.
--- drivers/staging/vt6655/Kconfig | 2 +- drivers/staging/vt6656/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vt6655/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6655 tristate "VIA Technologies VT6655 support" - depends on WIRELESS_EXT && PCI + depends on WIRELESS_EXT && PCI && WLAN ---help--- This is a vendor-written driver for VIA VT6655.
drivers/staging/vt6656/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6656 tristate "VIA Technologies VT6656 support" - depends on WIRELESS_EXT && USB + depends on WIRELESS_EXT && USB && WLAN ---help--- This is a vendor-written driver for VIA VT6656.
PATCH RESEND 1/1 g_multi kconfig: fix depends and help text
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
USB_G_MULTI uses block and net interface functions, so make it depend on both of those. Otherwise there are lots of build errors.
Fix USB_G_MULTI config help text typos and copy/paste error.
--- drivers/usb/gadget/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/usb/gadget/Kconfig +7 -7
@@ -814,16 +814,17 @@ config USB_CDC_COMPOSITE config USB_G_MULTI tristate "Multifunction Composite Gadget (EXPERIMENTAL)" + depends on BLOCK && NET help The Multifunction Composite Gadget provides Ethernet (RNDIS and/or CDC Ethernet), mass storage and ACM serial link interfaces. - You will be asked too choose which of the two configurations are + You will be asked to choose which of the two configurations is to be available in the gadget. At least one configuration must - be choosen to make gadget usable. Selecting more then one + be chosen to make the gadget usable. Selecting more than one configuration will prevent Windows from automatically detecting - the gadget as a composite gadget an INF file will be needed to + the gadget as a composite gadget, so an INF file will be needed to use the gadget. Say "y" to link the driver statically, or "m" to build a
@@ -836,8 +837,8 @@ config USB_G_MULTI_RNDIS help This option enables a configuration with RNDIS, CDC Serial and Mass Storage functions available in the Multifunction Composite - Gadget. This is configuration dedicated for Windows since RNDIS - is Microsfot's protocol. + Gadget. This is the configuration dedicated for Windows since RNDIS + is Microsoft's protocol. If unsure, say "y".
@@ -848,8 +849,7 @@ config USB_G_MULTI_CDC help This option enables a configuration with CDC Ethernet (ECM), CDC Serial and Mass Storage functions available in the Multifunction - Composite Gadget. This is configuration dedicated for Windows - since RNDIS is Microsfot's protocol. + Composite Gadget. If unsure, say "y".
Re: linux-next: Tree for December 4 (comedi)
In reply to Stephen RothwellQuoted 6 lines · On Fri, 4 Dec 2009 20:30:14 +1100 Stephen Rothwell wrote:
Hi all,
My usual call for calm: please do not put stuff destined for 2.6.34 into linux-next trees until after 2.6.33-rc1.
Changes since 20091203:
When PCCARD=m, PCMCIA=m, PCI=n, CARDBUS=n:
ERROR: "ni_tio_init_counter" [drivers/staging/comedi/drivers/ni_mio_cs.ko] undefined!
ERROR: "ni_gpct_device_construct" [drivers/staging/comedi/drivers/ni_mio_cs.ko] undefined!
ERROR: "ni_tio_rinsn" [drivers/staging/comedi/drivers/ni_mio_cs.ko] undefined!
ERROR: "ni_tio_winsn" [drivers/staging/comedi/drivers/ni_mio_cs.ko] undefined!
ERROR: "ni_tio_insn_config" [drivers/staging/comedi/drivers/ni_mio_cs.ko] undefined!
ERROR: "ni_gpct_device_destroy" [drivers/staging/comedi/drivers/ni_mio_cs.ko] undefined!
ERROR: "labpc_1200_is_unipolar" [drivers/staging/comedi/drivers/ni_labpc_cs.ko] undefined!
ERROR: "labpc_1200_ai_gain_bits" [drivers/staging/comedi/drivers/ni_labpc_cs.ko] undefined!
ERROR: "range_labpc_1200_ai" [drivers/staging/comedi/drivers/ni_labpc_cs.ko] undefined!
ERROR: "labpc_common_detach" [drivers/staging/comedi/drivers/ni_labpc_cs.ko] undefined!
ERROR: "labpc_common_attach" [drivers/staging/comedi/drivers/ni_labpc_cs.ko] undefined!
ERROR: "das08_cs_boards" [drivers/staging/comedi/drivers/das08_cs.ko] undefined!
ERROR: "das08_common_detach" [drivers/staging/comedi/drivers/das08_cs.ko] undefined!
ERROR: "das08_common_attach" [drivers/staging/comedi/drivers/das08_cs.ko] undefined!
---
~Randy