linux-next: Tree for August 19

linux-next: Tree for August 19

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 7682 bytes --]

Hi all,

Changes since next-20080818:

Linus' tree lost its build fix patch.

The v4l-dvb tree gained a conflict against the usb tree.

The vfs tree gained a conflict against eahc of Linus' tree and the ia64
tree. 

The arm tree gained a build fix patch.

The input tree gained a build fix patch due to a conflict with the usb
tree.

The ttydev tree lost 3 conflicts but gained another against the usb tree.

I have also applied the following patches for known problems:

	Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 110 trees (counting Linus' and 14 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                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging dwmw2/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
CONFLICT (content): Merge conflict in kernel/module.c
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
CONFLICT (content): Merge conflict in kernel/fork.c
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in include/asm-x86/pda.h
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
CONFLICT (content): Merge conflict in drivers/media/video/zr364xx.c
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in include/asm-x86/kvm.h
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging sparc/master
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h
Merging vfs/for-next
CONFLICT (content): Merge conflict in arch/ia64/ia32/sys_ia32.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/sys_ppc32.c
CONFLICT (content): Merge conflict in fs/nfsd/export.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_export.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_iops.c
Merging sound/for-next
Merging arm/devel
Applying ucb1400: restore NO_IRQ definition
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Applying input/cm109: fix up for info() removal
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
Merging bkl-removal/bkl-removal
Merging trivial/next
CONFLICT (content): Merge conflict in Documentation/edac.txt
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging m68knommu/for-next
Merging uclinux/for-next
Merging md/for-next
Merging cris/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
CONFLICT (content): Merge conflict in arch/x86/kernel/traps_64.c
CONFLICT (content): Merge conflict in mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
Merging generic-ipi/auto-generic-ipi-next
Merging mips/mips-for-linux-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/net/usb/hso.c
CONFLICT (content): Merge conflict in drivers/usb/serial/safe_serial.c
Merging agp/agp-next
Merging creds/next-creds
CONFLICT (content): Merge conflict in fs/namespace.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_linux.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.c
CONFLICT (content): Merge conflict in include/linux/capability.h
CONFLICT (add/add): Merge conflict in include/linux/cred.h
CONFLICT (content): Merge conflict in kernel/exit.c
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in security/commoncap.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
CONFLICT (content): Merge conflict in include/linux/init.h
Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

[PATCH next-20080819] drivers/usb/atm: Fix non-existing warn()

[Takashi Iwai]

Fix the die-hard warn() in drivers/usb/atm/usbatm.h that caused a
build error.

Signed-off-by: Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>
---
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index e6887c6..714dc14 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -42,7 +42,7 @@
 #ifdef DEBUG
 #define UDSL_ASSERT(x)	BUG_ON(!(x))
 #else
-#define UDSL_ASSERT(x)	do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
+#define UDSL_ASSERT(x)	do { if (!(x)) pr_warning("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
 #endif
 
 #define usb_err(instance, format, arg...)	\
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH next-20080819] drivers/usb/atm: Fix non-existing warn()

[Greg KH]

On Tue, Aug 19, 2008 at 01:28:48PM +0200, Takashi Iwai wrote:
> Fix the die-hard warn() in drivers/usb/atm/usbatm.h that caused a
> build error.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
> index e6887c6..714dc14 100644
> --- a/drivers/usb/atm/usbatm.h
> +++ b/drivers/usb/atm/usbatm.h
> @@ -42,7 +42,7 @@
>  #ifdef DEBUG
>  #define UDSL_ASSERT(x)	BUG_ON(!(x))
>  #else
> -#define UDSL_ASSERT(x)	do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
> +#define UDSL_ASSERT(x)	do { if (!(x)) pr_warning("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
>  #endif
>  
>  #define usb_err(instance, format, arg...)	\

Ah, sorry about that, I don't see how I missed it, I'll go fix this up.

Oh, you forgot the '\n' as well, I'll just convert this to a standard
printk() so everyone konws what is happening...

greg k-h

Re: linux-next: Tree for August 19 (mfd/ucb)

[Randy Dunlap]

drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
on AC97_BUS, like in the patch below.  However, with that patch in
place, oldconfig goes belly up on me:


linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
make -C /local/linsrc/linux-next-20080819/X64 \
	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
	oldconfig
make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
/bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
  GEN     /local/linsrc/linux-next-20080819/X64/Makefile
mkdir -p include/linux include/config
make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
scripts/kconfig/conf -o arch/x86/Kconfig
make[2]: *** [oldconfig] Segmentation fault (core dumped)
make[1]: *** [oldconfig] Error 2
make: *** [sub-make] Error 2



---
From: Randy Dunlap <randy.dunlap@oracle.com>

mfd/ucb1400 sound driver uses/depends on AC97_BUS:

ERROR: "ac97_bus_type" [drivers/mfd/ucb1400_core.ko] undefined!


Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
cc: Samuel Ortiz <sameo@openedhand.com>

---
 drivers/mfd/Kconfig |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20080819.orig/drivers/mfd/Kconfig
+++ linux-next-20080819/drivers/mfd/Kconfig
@@ -52,6 +52,7 @@ config HTC_PASIC3
 
 config UCB1400_CORE
 	tristate "Philips UCB1400 Core driver"
+	depends on AC97_BUS
 	help
 	  This enables support for the Philips UCB1400 core functions.
 	  The UCB1400 is an AC97 audio codec.

Re: linux-next: Tree for August 19 (mfd/ucb)

[Andrew Morton]

On Tue, 19 Aug 2008 17:05:17 -0700
Randy Dunlap <randy.dunlap@oracle.com> wrote:

> drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> on AC97_BUS, like in the patch below.  However, with that patch in
> place, oldconfig goes belly up on me:
> 
> 
> linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> make -C /local/linsrc/linux-next-20080819/X64 \
> 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> 	oldconfig
> make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
>   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> mkdir -p include/linux include/config
> make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> scripts/kconfig/conf -o arch/x86/Kconfig
> make[2]: *** [oldconfig] Segmentation fault (core dumped)
> make[1]: *** [oldconfig] Error 2
> make: *** [sub-make] Error 2
> 
> 
> 
> ---
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> mfd/ucb1400 sound driver uses/depends on AC97_BUS:
> 
> ERROR: "ac97_bus_type" [drivers/mfd/ucb1400_core.ko] undefined!
> 
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> cc: Samuel Ortiz <sameo@openedhand.com>
> 
> ---
>  drivers/mfd/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20080819.orig/drivers/mfd/Kconfig
> +++ linux-next-20080819/drivers/mfd/Kconfig
> @@ -52,6 +52,7 @@ config HTC_PASIC3
>  
>  config UCB1400_CORE
>  	tristate "Philips UCB1400 Core driver"
> +	depends on AC97_BUS
>  	help
>  	  This enables support for the Philips UCB1400 core functions.
>  	  The UCB1400 is an AC97 audio codec.

And this:

From: Andrew Morton <akpm@linux-foundation.org>

ia64 allmodconfig:

In file included from include/linux/ucb1400.h:27,
                 from drivers/mfd/ucb1400_core.c:24:
include/asm-generic/gpio.h: In function `gpio_get_value_cansleep':
include/asm-generic/gpio.h:147: error: implicit declaration of function `gpio_get_value'
include/asm-generic/gpio.h: In function `gpio_set_value_cansleep':
include/asm-generic/gpio.h:153: error: implicit declaration of function `gpio_set_value'
drivers/mfd/ucb1400_core.c: At top level:

Cc: Samuel Ortiz <sameo@openedhand.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mfd/Kconfig |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/mfd/Kconfig~drivers-mfd-ucb1400_corec-needs-gpio drivers/mfd/Kconfig
--- a/drivers/mfd/Kconfig~drivers-mfd-ucb1400_corec-needs-gpio
+++ a/drivers/mfd/Kconfig
@@ -53,6 +53,7 @@ config HTC_PASIC3
 config UCB1400_CORE
 	tristate "Philips UCB1400 Core driver"
 	depends on AC97_BUS
+	depends on GPIOLIB
 	help
 	  This enables support for the Philips UCB1400 core functions.
 	  The UCB1400 is an AC97 audio codec.
_

Re: linux-next: Tree for August 19 (mfd/ucb)

[Andrew Morton]

On Tue, 19 Aug 2008 17:05:17 -0700
Randy Dunlap <randy.dunlap@oracle.com> wrote:

> drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> on AC97_BUS, like in the patch below.  However, with that patch in
> place, oldconfig goes belly up on me:
> 
> 
> linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> make -C /local/linsrc/linux-next-20080819/X64 \
> 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> 	oldconfig
> make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
>   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> mkdir -p include/linux include/config
> make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> scripts/kconfig/conf -o arch/x86/Kconfig
> make[2]: *** [oldconfig] Segmentation fault (core dumped)
> make[1]: *** [oldconfig] Error 2

I'm hitting that segfault as well:

akpm2:/usr/src/25> scripts/kconfig/conf -o arch/ia64/Kconfig
init/Kconfig:5:warning: environment variable KERNELVERSION undefined
zsh: segmentation fault (core dumped)  scripts/kconfig/conf -o arch/ia64/Kconfig


Can't find the core file - wtf?  Plan B:


akpm2:/usr/src/25> gdb scripts/kconfig/conf
...
This GDB was configured as "x86_64-redhat-linux-gnu"...(no debugging symbols found)

why don't we build these things with -g by default?  grump.

(gdb) r -o arch/ia64/Kconfig 
Starting program: /usr/src/devel/scripts/kconfig/conf -o arch/ia64/Kconfig
Failed to read a valid object file image from memory.
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
init/Kconfig:5:warning: environment variable KERNELVERSION undefined

Program received signal SIGSEGV, Segmentation fault.
0x000000000040419c in sym_check_deps ()
(gdb) bt
#0  0x000000000040419c in sym_check_deps ()
#1  0x0000000000404099 in sym_check_expr_deps ()
#2  0x000000000040412c in sym_check_sym_deps ()
#3  0x00000000004042f5 in sym_check_deps ()
#4  0x0000000000404099 in sym_check_expr_deps ()
#5  0x000000000040412c in sym_check_sym_deps ()
#6  0x00000000004042f5 in sym_check_deps ()
#7  0x0000000000404099 in sym_check_expr_deps ()
#8  0x0000000000404099 in sym_check_expr_deps ()
#9  0x0000000000404099 in sym_check_expr_deps ()
#10 0x0000000000404099 in sym_check_expr_deps ()
#11 0x0000000000404099 in sym_check_expr_deps ()
#12 0x0000000000404099 in sym_check_expr_deps ()
#13 0x00000000004040f2 in sym_check_sym_deps ()
#14 0x00000000004042f5 in sym_check_deps ()
#15 0x000000000040412c in sym_check_sym_deps ()
#16 0x00000000004042f5 in sym_check_deps ()
#17 0x000000000040412c in sym_check_sym_deps ()
#18 0x00000000004042f5 in sym_check_deps ()
#19 0x000000000040bb83 in conf_parse ()
#20 0x000000000040269c in main ()

Re: [PATCH next-20080819] drivers/usb/atm: Fix non-existing warn()

[Greg KH]

On Tue, Aug 19, 2008 at 01:28:48PM +0200, Takashi Iwai wrote:
> Fix the die-hard warn() in drivers/usb/atm/usbatm.h that caused a
> build error.
> 
> Signed-off-by: Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>
> ---
> diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
> index e6887c6..714dc14 100644
> --- a/drivers/usb/atm/usbatm.h
> +++ b/drivers/usb/atm/usbatm.h
> @@ -42,7 +42,7 @@
>  #ifdef DEBUG
>  #define UDSL_ASSERT(x)	BUG_ON(!(x))
>  #else
> -#define UDSL_ASSERT(x)	do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
> +#define UDSL_ASSERT(x)	do { if (!(x)) pr_warning("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
>  #endif

I fixed it a bit differently, using dev_warn() instead and passing the
"instance" to the macro like the other macros defined in this file.
That way any user knows exactly which device and driver caused the
driver to go boom :)

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: linux-next: Tree for August 19 (mfd/ucb)

[KAMEZAWA Hiroyuki]

On Tue, 19 Aug 2008 17:16:58 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:

> On Tue, 19 Aug 2008 17:05:17 -0700
> Randy Dunlap <randy.dunlap@oracle.com> wrote:
> 
> > drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> > on AC97_BUS, like in the patch below.  However, with that patch in
> > place, oldconfig goes belly up on me:
> > 
> > 
> > linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> > make -C /local/linsrc/linux-next-20080819/X64 \
> > 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> > 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> > 	oldconfig
> > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> > /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> > 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
> >   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> > mkdir -p include/linux include/config
> > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> > scripts/kconfig/conf -o arch/x86/Kconfig
> > make[2]: *** [oldconfig] Segmentation fault (core dumped)
> > make[1]: *** [oldconfig] Error 2
> > make: *** [sub-make] Error 2
> > 
> > 
> > 
> > ---
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > mfd/ucb1400 sound driver uses/depends on AC97_BUS:
> > 
> > ERROR: "ac97_bus_type" [drivers/mfd/ucb1400_core.ko] undefined!
> > 
> > 
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > cc: Samuel Ortiz <sameo@openedhand.com>
> > 
> > ---
> >  drivers/mfd/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > --- linux-next-20080819.orig/drivers/mfd/Kconfig
> > +++ linux-next-20080819/drivers/mfd/Kconfig
> > @@ -52,6 +52,7 @@ config HTC_PASIC3
> >  
> >  config UCB1400_CORE
> >  	tristate "Philips UCB1400 Core driver"
> > +	depends on AC97_BUS
> >  	help
> >  	  This enables support for the Philips UCB1400 core functions.
> >  	  The UCB1400 is an AC97 audio codec.
> 
> And this:
> 
I still see SEGV in the latest mmtom (on x86-64)

drivers/input/touchscreen/Kconfig has this definition.

config TOUCHSCREEN_UCB1400
        tristate "Philips UCB1400 touchscreen"
        select AC97_BUS
        depends on UCB1400_CORE
        depends on GPIOLIB

"select" should be "depends on" ,here ?


Thanks,
-Kame

Re: linux-next: Tree for August 19 (mfd/ucb)

[Sam Ravnborg]

On Tue, Aug 19, 2008 at 05:05:17PM -0700, Randy Dunlap wrote:
> drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> on AC97_BUS, like in the patch below.  However, with that patch in
> place, oldconfig goes belly up on me:
> 
> 
> linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> make -C /local/linsrc/linux-next-20080819/X64 \
> 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> 	oldconfig
> make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
>   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> mkdir -p include/linux include/config
> make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> scripts/kconfig/conf -o arch/x86/Kconfig
> make[2]: *** [oldconfig] Segmentation fault (core dumped)
> make[1]: *** [oldconfig] Error 2
> make: *** [sub-make] Error 2

I have an outstanding bug in kconfig where it SEGV when it
sees a circular dependency - and I think you hit it here :-(

	Sam

Re: linux-next: Tree for August 19 (mfd/ucb)

[Randy.Dunlap]

On Wed, 20 Aug 2008, KAMEZAWA Hiroyuki wrote:

> On Tue, 19 Aug 2008 17:16:58 -0700
> Andrew Morton <akpm@linux-foundation.org> wrote:
> 
> > On Tue, 19 Aug 2008 17:05:17 -0700
> > Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > 
> > > drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> > > on AC97_BUS, like in the patch below.  However, with that patch in
> > > place, oldconfig goes belly up on me:
> > > 
> > > 
> > > linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> > > make -C /local/linsrc/linux-next-20080819/X64 \
> > > 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> > > 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> > > 	oldconfig
> > > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> > > /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> > > 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
> > >   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> > > mkdir -p include/linux include/config
> > > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> > > scripts/kconfig/conf -o arch/x86/Kconfig
> > > make[2]: *** [oldconfig] Segmentation fault (core dumped)
> > > make[1]: *** [oldconfig] Error 2
> > > make: *** [sub-make] Error 2
> > > 
> > > 
> > > 
> > > ---
> > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > > 
> > > mfd/ucb1400 sound driver uses/depends on AC97_BUS:
> > > 
> > > ERROR: "ac97_bus_type" [drivers/mfd/ucb1400_core.ko] undefined!
> > > 
> > > 
> > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > > cc: Samuel Ortiz <sameo@openedhand.com>
> > > 
> > > ---
> > >  drivers/mfd/Kconfig |    1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > --- linux-next-20080819.orig/drivers/mfd/Kconfig
> > > +++ linux-next-20080819/drivers/mfd/Kconfig
> > > @@ -52,6 +52,7 @@ config HTC_PASIC3
> > >  
> > >  config UCB1400_CORE
> > >  	tristate "Philips UCB1400 Core driver"
> > > +	depends on AC97_BUS
> > >  	help
> > >  	  This enables support for the Philips UCB1400 core functions.
> > >  	  The UCB1400 is an AC97 audio codec.
> > 
> > And this:
> > 
> I still see SEGV in the latest mmtom (on x86-64)
> 
> drivers/input/touchscreen/Kconfig has this definition.
> 
> config TOUCHSCREEN_UCB1400
>         tristate "Philips UCB1400 touchscreen"
>         select AC97_BUS
>         depends on UCB1400_CORE
>         depends on GPIOLIB
> 
> "select" should be "depends on" ,here ?

Thanks for pointing that out.  Yes, that should be depends on IMO.
What is happening is that selecting AC97_BUS doesn't do anything
useful since CONFIG_SOUND is not enabled.  Also, IMO we don't
want to select SOUND since it is a non-trivial subsystem and
should be enabled by user(s), not via select.

And changing this will probably fix the SEGV in kconfig...

-- 
~Randy

Re: linux-next: Tree for August 19 (mfd/ucb)

[Takashi Iwai]

At Tue, 19 Aug 2008 17:16:58 -0700,
Andrew Morton wrote:
> 
> On Tue, 19 Aug 2008 17:05:17 -0700
> Randy Dunlap <randy.dunlap@oracle.com> wrote:
> 
> > drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> > on AC97_BUS, like in the patch below.  However, with that patch in
> > place, oldconfig goes belly up on me:
> > 
> > 
> > linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> > make -C /local/linsrc/linux-next-20080819/X64 \
> > 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> > 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> > 	oldconfig
> > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> > /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> > 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
> >   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> > mkdir -p include/linux include/config
> > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> > scripts/kconfig/conf -o arch/x86/Kconfig
> > make[2]: *** [oldconfig] Segmentation fault (core dumped)
> > make[1]: *** [oldconfig] Error 2
> > make: *** [sub-make] Error 2
> > 
> > 
> > 
> > ---
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > mfd/ucb1400 sound driver uses/depends on AC97_BUS:
> > 
> > ERROR: "ac97_bus_type" [drivers/mfd/ucb1400_core.ko] undefined!
> > 
> > 
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > cc: Samuel Ortiz <sameo@openedhand.com>
> > 
> > ---
> >  drivers/mfd/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > --- linux-next-20080819.orig/drivers/mfd/Kconfig
> > +++ linux-next-20080819/drivers/mfd/Kconfig
> > @@ -52,6 +52,7 @@ config HTC_PASIC3
> >  
> >  config UCB1400_CORE
> >  	tristate "Philips UCB1400 Core driver"
> > +	depends on AC97_BUS
> >  	help
> >  	  This enables support for the Philips UCB1400 core functions.
> >  	  The UCB1400 is an AC97 audio codec.
> 
> And this:
> 
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> ia64 allmodconfig:
> 
> In file included from include/linux/ucb1400.h:27,
>                  from drivers/mfd/ucb1400_core.c:24:
> include/asm-generic/gpio.h: In function `gpio_get_value_cansleep':
> include/asm-generic/gpio.h:147: error: implicit declaration of function `gpio_get_value'
> include/asm-generic/gpio.h: In function `gpio_set_value_cansleep':
> include/asm-generic/gpio.h:153: error: implicit declaration of function `gpio_set_value'
> drivers/mfd/ucb1400_core.c: At top level:

This one is because the superfluous inclusion of <asm-generic/gpio.h>.
Should have been fixed in the latest Russell's tree.


Takashi

Re: linux-next: Tree for August 19 (mfd/ucb)

[Russell King]

On Wed, Aug 20, 2008 at 09:49:58AM +0200, Takashi Iwai wrote:
> At Tue, 19 Aug 2008 17:16:58 -0700,
> Andrew Morton wrote:
> > 
> > On Tue, 19 Aug 2008 17:05:17 -0700
> > Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > 
> > > drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> > > on AC97_BUS, like in the patch below.  However, with that patch in
> > > place, oldconfig goes belly up on me:
> > > 
> > > 
> > > linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> > > make -C /local/linsrc/linux-next-20080819/X64 \
> > > 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> > > 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> > > 	oldconfig
> > > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> > > /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> > > 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
> > >   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> > > mkdir -p include/linux include/config
> > > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> > > scripts/kconfig/conf -o arch/x86/Kconfig
> > > make[2]: *** [oldconfig] Segmentation fault (core dumped)
> > > make[1]: *** [oldconfig] Error 2
> > > make: *** [sub-make] Error 2
> > > 
> > > 
> > > 
> > > ---
> > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > > 
> > > mfd/ucb1400 sound driver uses/depends on AC97_BUS:
> > > 
> > > ERROR: "ac97_bus_type" [drivers/mfd/ucb1400_core.ko] undefined!
> > > 
> > > 
> > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > > cc: Samuel Ortiz <sameo@openedhand.com>
> > > 
> > > ---
> > >  drivers/mfd/Kconfig |    1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > --- linux-next-20080819.orig/drivers/mfd/Kconfig
> > > +++ linux-next-20080819/drivers/mfd/Kconfig
> > > @@ -52,6 +52,7 @@ config HTC_PASIC3
> > >  
> > >  config UCB1400_CORE
> > >  	tristate "Philips UCB1400 Core driver"
> > > +	depends on AC97_BUS
> > >  	help
> > >  	  This enables support for the Philips UCB1400 core functions.
> > >  	  The UCB1400 is an AC97 audio codec.
> > 
> > And this:
> > 
> > From: Andrew Morton <akpm@linux-foundation.org>
> > 
> > ia64 allmodconfig:
> > 
> > In file included from include/linux/ucb1400.h:27,
> >                  from drivers/mfd/ucb1400_core.c:24:
> > include/asm-generic/gpio.h: In function `gpio_get_value_cansleep':
> > include/asm-generic/gpio.h:147: error: implicit declaration of function `gpio_get_value'
> > include/asm-generic/gpio.h: In function `gpio_set_value_cansleep':
> > include/asm-generic/gpio.h:153: error: implicit declaration of function `gpio_set_value'
> > drivers/mfd/ucb1400_core.c: At top level:
> 
> This one is because the superfluous inclusion of <asm-generic/gpio.h>.
> Should have been fixed in the latest Russell's tree.

Haven't merged the two fixes discussed just yet - I only got a reply
from Stephen on his this morning.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

Re: linux-next: Tree for August 19 (mfd/ucb)

[Takashi Iwai]

At Wed, 20 Aug 2008 08:57:34 +0100,
Russell King wrote:
> 
> On Wed, Aug 20, 2008 at 09:49:58AM +0200, Takashi Iwai wrote:
> > At Tue, 19 Aug 2008 17:16:58 -0700,
> > Andrew Morton wrote:
> > > 
> > > On Tue, 19 Aug 2008 17:05:17 -0700
> > > Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > > 
> > > > drivers/mfd/ucb1400 is a sound (AC97) driver, so it should depend
> > > > on AC97_BUS, like in the patch below.  However, with that patch in
> > > > place, oldconfig goes belly up on me:
> > > > 
> > > > 
> > > > linux-next-20080819> make ARCH=x86_64  O=X64  V=1 oldconfig
> > > > make -C /local/linsrc/linux-next-20080819/X64 \
> > > > 	KBUILD_SRC=/local/linsrc/linux-next-20080819 \
> > > > 	KBUILD_EXTMOD="" -f /local/linsrc/linux-next-20080819/Makefile \
> > > > 	oldconfig
> > > > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/basic
> > > > /bin/sh /local/linsrc/linux-next-20080819/scripts/mkmakefile \
> > > > 	    /local/linsrc/linux-next-20080819 /local/linsrc/linux-next-20080819/X64 2 6
> > > >   GEN     /local/linsrc/linux-next-20080819/X64/Makefile
> > > > mkdir -p include/linux include/config
> > > > make -f /local/linsrc/linux-next-20080819/scripts/Makefile.build obj=scripts/kconfig oldconfig
> > > > scripts/kconfig/conf -o arch/x86/Kconfig
> > > > make[2]: *** [oldconfig] Segmentation fault (core dumped)
> > > > make[1]: *** [oldconfig] Error 2
> > > > make: *** [sub-make] Error 2
> > > > 
> > > > 
> > > > 
> > > > ---
> > > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > > > 
> > > > mfd/ucb1400 sound driver uses/depends on AC97_BUS:
> > > > 
> > > > ERROR: "ac97_bus_type" [drivers/mfd/ucb1400_core.ko] undefined!
> > > > 
> > > > 
> > > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > > > cc: Samuel Ortiz <sameo@openedhand.com>
> > > > 
> > > > ---
> > > >  drivers/mfd/Kconfig |    1 +
> > > >  1 file changed, 1 insertion(+)
> > > > 
> > > > --- linux-next-20080819.orig/drivers/mfd/Kconfig
> > > > +++ linux-next-20080819/drivers/mfd/Kconfig
> > > > @@ -52,6 +52,7 @@ config HTC_PASIC3
> > > >  
> > > >  config UCB1400_CORE
> > > >  	tristate "Philips UCB1400 Core driver"
> > > > +	depends on AC97_BUS
> > > >  	help
> > > >  	  This enables support for the Philips UCB1400 core functions.
> > > >  	  The UCB1400 is an AC97 audio codec.
> > > 
> > > And this:
> > > 
> > > From: Andrew Morton <akpm@linux-foundation.org>
> > > 
> > > ia64 allmodconfig:
> > > 
> > > In file included from include/linux/ucb1400.h:27,
> > >                  from drivers/mfd/ucb1400_core.c:24:
> > > include/asm-generic/gpio.h: In function `gpio_get_value_cansleep':
> > > include/asm-generic/gpio.h:147: error: implicit declaration of function `gpio_get_value'
> > > include/asm-generic/gpio.h: In function `gpio_set_value_cansleep':
> > > include/asm-generic/gpio.h:153: error: implicit declaration of function `gpio_set_value'
> > > drivers/mfd/ucb1400_core.c: At top level:
> > 
> > This one is because the superfluous inclusion of <asm-generic/gpio.h>.
> > Should have been fixed in the latest Russell's tree.
> 
> Haven't merged the two fixes discussed just yet - I only got a reply
> from Stephen on his this morning.

Oh, a different time zone...


Takashi

Re: [PATCH next-20080819] drivers/usb/atm: Fix non-existing warn()

[Takashi Iwai]

At Tue, 19 Aug 2008 17:47:23 -0700,
Greg KH wrote:
> 
> On Tue, Aug 19, 2008 at 01:28:48PM +0200, Takashi Iwai wrote:
> > Fix the die-hard warn() in drivers/usb/atm/usbatm.h that caused a
> > build error.
> > 
> > Signed-off-by: Takashi Iwai <tiwai-l3A5Bk7waGM@public.gmane.org>
> > ---
> > diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
> > index e6887c6..714dc14 100644
> > --- a/drivers/usb/atm/usbatm.h
> > +++ b/drivers/usb/atm/usbatm.h
> > @@ -42,7 +42,7 @@
> >  #ifdef DEBUG
> >  #define UDSL_ASSERT(x)	BUG_ON(!(x))
> >  #else
> > -#define UDSL_ASSERT(x)	do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
> > +#define UDSL_ASSERT(x)	do { if (!(x)) pr_warning("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
> >  #endif
> 
> I fixed it a bit differently, using dev_warn() instead and passing the
> "instance" to the macro like the other macros defined in this file.
> That way any user knows exactly which device and driver caused the
> driver to go boom :)

Thanks, that's much better.


Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: linux-next: Tree for August 19 (mfd/ucb)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 611 bytes --]

On Wed, 20 Aug 2008 08:57:34 +0100 Russell King <rmk+lkml@arm.linux.org.uk> wrote:
>
> On Wed, Aug 20, 2008 at 09:49:58AM +0200, Takashi Iwai wrote:
> > 
> > This one is because the superfluous inclusion of <asm-generic/gpio.h>.
> > Should have been fixed in the latest Russell's tree.
> 
> Haven't merged the two fixes discussed just yet - I only got a reply
> from Stephen on his this morning.

I have added Takashi's patch to the end of linux-next for today and will
remove it tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]