linux-next: Tree for December 13

linux-next: Tree for December 13

[Stephen Rothwell]

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

Hi all,

Changes since 20101210:

The v4l-dvb tree lost its build failure.

The acpi tree lost its build failure.

The ieee1394 tree gained a build failure so I used the version from
next-20101210.

The net tree lost a conflict.

The trivial tree gained a conflict against the omap tree.

The swiotlb-xen tree gained conflicts against the xen tree and a build
failure so I used the version from next-20101210.

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

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 181 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ 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 driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging 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
Merging tegra/for-next
Merging ux500-core/ux500-core
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/sh-latest
Merging rmobile/rmobile-latest
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Applying: rmobile: merge fixup for clkdev changes
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
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
Merging idle-test/idle-test
Merging ieee1394/for-next
$ git reset --hard HEAD^
Merging refs/next/20101210/ieee1394
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging wireless/master
Merging net/master
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/Makefile
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/sh/fsi.c
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/core.c
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm24xx.c
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Makefile
$ git reset --hard HEAD^
Merging refs/next/20101210/swiotlb-xen
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (delete/modify): arch/x86/kernel/apic/nmi.c deleted in HEAD and modified in percpu/for-next. Version percpu/for-next of arch/x86/kernel/apic/nmi.c left in tree.
$ git rm -f arch/x86/kernel/apic/nmi.c
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/sh/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/musb/blackfin.c
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master

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

[PATCH -next] thermal: depends on NET

[Randy Dunlap]

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

ERROR: "genl_register_family" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "genl_unregister_family" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "init_net" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "__alloc_skb" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "netlink_broadcast" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "kfree_skb" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "genl_register_mc_group" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "nla_reserve" [drivers/thermal/thermal_sys.ko] undefined!
ERROR: "skb_put" [drivers/thermal/thermal_sys.ko] undefined!

Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Zhang Rui <rui.zhang@intel.com>
---
 drivers/thermal/Kconfig |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20101213.orig/drivers/thermal/Kconfig
+++ linux-next-20101213/drivers/thermal/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig THERMAL
 	tristate "Generic Thermal sysfs driver"
+	depends on NET
 	help
 	  Generic Thermal Sysfs driver offers a generic mechanism for
 	  thermal management. Usually it's made up of one or more thermal

[PATCH -next] cs5535: fix printk format warnings

[Randy Dunlap]

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

Fix printk format warnings in cs5535 drivers:

drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Andres Salomon <dilinger@collabora.co.uk>
---
 drivers/gpio/cs5535-gpio.c  |    5 +++--
 drivers/misc/cs5535-mfgpt.c |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

--- linux-next-20101213.orig/drivers/gpio/cs5535-gpio.c
+++ linux-next-20101213/drivers/gpio/cs5535-gpio.c
@@ -266,8 +266,9 @@ static int __devinit cs5535_gpio_probe(s
 	cs5535_gpio_chip.pdev = pdev;
 	spin_lock_init(&cs5535_gpio_chip.lock);
 
-	dev_info(&pdev->dev, "region 0x%x - 0x%x reserved\n",
-			res->start, res->end);
+	dev_info(&pdev->dev, "region 0x%llx - 0x%llx reserved\n",
+			(unsigned long long)res->start,
+			(unsigned long long)res->end);
 
 	/* mask out reserved pins */
 	mask &= 0x1F7FFFFF;
--- linux-next-20101213.orig/drivers/misc/cs5535-mfgpt.c
+++ linux-next-20101213/drivers/misc/cs5535-mfgpt.c
@@ -317,8 +317,9 @@ static int __devinit cs5535_mfgpt_probe(
 	cs5535_mfgpt_chip.pdev = pdev;
 	spin_lock_init(&cs5535_mfgpt_chip.lock);
 
-	dev_info(&pdev->dev, "region 0x%x - 0x%x reserved\n", res->start,
-			res->end);
+	dev_info(&pdev->dev, "region 0x%llx - 0x%llx reserved\n",
+			(unsigned long long)res->start,
+			(unsigned long long)res->end);
 
 	/* detect the available timers */
 	t = scan_timers(&cs5535_mfgpt_chip);

[PATCH V2 -next] cs5535: fix printk format warnings

[Joe Perches]

Use vsprintf extension %pR to format resource.

Original-patch-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Joe Perches <joe@perches.com>

---

 drivers/gpio/cs5535-gpio.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/cs5535-gpio.c b/drivers/gpio/cs5535-gpio.c
index b566fd5e..d7da7a1 100644
--- a/drivers/gpio/cs5535-gpio.c
+++ b/drivers/gpio/cs5535-gpio.c
@@ -266,8 +266,7 @@ static int __devinit cs5535_gpio_probe(struct platform_device *pdev)
 	cs5535_gpio_chip.pdev = pdev;
 	spin_lock_init(&cs5535_gpio_chip.lock);
 
-	dev_info(&pdev->dev, "region 0x%x - 0x%x reserved\n",
-			res->start, res->end);
+	dev_info(&pdev->dev, "reserved resource region %pR\n", res);
 
 	/* mask out reserved pins */
 	mask &= 0x1F7FFFFF;

Re: [PATCH V2 -next] cs5535: fix printk format warnings

[Randy Dunlap]

On 12/13/10 12:28, Joe Perches wrote:
> Use vsprintf extension %pR to format resource.
> 
> Original-patch-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Joe Perches <joe@perches.com>
> 
> ---
> 
>  drivers/gpio/cs5535-gpio.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpio/cs5535-gpio.c b/drivers/gpio/cs5535-gpio.c
> index b566fd5e..d7da7a1 100644
> --- a/drivers/gpio/cs5535-gpio.c
> +++ b/drivers/gpio/cs5535-gpio.c
> @@ -266,8 +266,7 @@ static int __devinit cs5535_gpio_probe(struct platform_device *pdev)
>  	cs5535_gpio_chip.pdev = pdev;
>  	spin_lock_init(&cs5535_gpio_chip.lock);
>  
> -	dev_info(&pdev->dev, "region 0x%x - 0x%x reserved\n",
> -			res->start, res->end);
> +	dev_info(&pdev->dev, "reserved resource region %pR\n", res);
>  
>  	/* mask out reserved pins */
>  	mask &= 0x1F7FFFFF;
> 
> 


OK.  How about similar patch for the other warnings:

drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

[PATCH V3 -next] cs5535: fix printk format warnings

[Joe Perches]

Use vsprintf extension %pR to format resource.

Original-patch-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Joe Perches <joe@perches.com>

---

V3 - Might as well do both files, thanks Randy...

Removed Andres Salomon <dilinger@collabora.co.uk> from cc.
It seems that he's not there anymore.

 drivers/gpio/cs5535-gpio.c  |    3 +--
 drivers/misc/cs5535-mfgpt.c |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/cs5535-gpio.c b/drivers/gpio/cs5535-gpio.c
index b566fd5e..d7da7a1 100644
--- a/drivers/gpio/cs5535-gpio.c
+++ b/drivers/gpio/cs5535-gpio.c
@@ -266,8 +266,7 @@ static int __devinit cs5535_gpio_probe(struct platform_device *pdev)
 	cs5535_gpio_chip.pdev = pdev;
 	spin_lock_init(&cs5535_gpio_chip.lock);
 
-	dev_info(&pdev->dev, "region 0x%x - 0x%x reserved\n",
-			res->start, res->end);
+	dev_info(&pdev->dev, "reserved resource region %pR\n", res);
 
 	/* mask out reserved pins */
 	mask &= 0x1F7FFFFF;
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
index 2669306..e90506b 100644
--- a/drivers/misc/cs5535-mfgpt.c
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -317,8 +317,7 @@ static int __devinit cs5535_mfgpt_probe(struct platform_device *pdev)
 	cs5535_mfgpt_chip.pdev = pdev;
 	spin_lock_init(&cs5535_mfgpt_chip.lock);
 
-	dev_info(&pdev->dev, "region 0x%x - 0x%x reserved\n", res->start,
-			res->end);
+	dev_info(&pdev->dev, "reserved resource region %pR\n", res);
 
 	/* detect the available timers */
 	t = scan_timers(&cs5535_mfgpt_chip);

Re: [PATCH -next] thermal: depends on NET

[Randy Dunlap]

This is still needed in linux-next 20101220.


On Mon, 13 Dec 2010 11:20:33 -0800 Randy Dunlap wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> ERROR: "genl_register_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_unregister_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "init_net" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "__alloc_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "netlink_broadcast" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "kfree_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_register_mc_group" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "nla_reserve" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "skb_put" [drivers/thermal/thermal_sys.ko] undefined!
> 
> Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Zhang Rui <rui.zhang@intel.com>
> ---
>  drivers/thermal/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20101213.orig/drivers/thermal/Kconfig
> +++ linux-next-20101213/drivers/thermal/Kconfig
> @@ -4,6 +4,7 @@
>  
>  menuconfig THERMAL
>  	tristate "Generic Thermal sysfs driver"
> +	depends on NET
>  	help
>  	  Generic Thermal Sysfs driver offers a generic mechanism for
>  	  thermal management. Usually it's made up of one or more thermal
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
desserts:  http://www.xenotime.net/linux/recipes/

Re: [PATCH -next] thermal: depends on NET

[Randy Dunlap]

On Mon, 13 Dec 2010 11:20:33 -0800 Randy Dunlap wrote:

This patch is still needed in linux-next 20110104.


> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> ERROR: "genl_register_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_unregister_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "init_net" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "__alloc_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "netlink_broadcast" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "kfree_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_register_mc_group" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "nla_reserve" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "skb_put" [drivers/thermal/thermal_sys.ko] undefined!
> 
> Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Zhang Rui <rui.zhang@intel.com>
> ---
>  drivers/thermal/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20101213.orig/drivers/thermal/Kconfig
> +++ linux-next-20101213/drivers/thermal/Kconfig
> @@ -4,6 +4,7 @@
>  
>  menuconfig THERMAL
>  	tristate "Generic Thermal sysfs driver"
> +	depends on NET
>  	help
>  	  Generic Thermal Sysfs driver offers a generic mechanism for
>  	  thermal management. Usually it's made up of one or more thermal
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
desserts:  http://www.xenotime.net/linux/recipes/

Re: [PATCH -next] thermal: depends on NET

[Randy Dunlap]

On Mon, 13 Dec 2010 11:20:33 -0800 Randy Dunlap wrote:

This is still needed in linux-next 20110110.

Adding linux-acpi.

Ping.  Is anybody there?  It has only been 4 weeks now with no reply...



> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> ERROR: "genl_register_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_unregister_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "init_net" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "__alloc_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "netlink_broadcast" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "kfree_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_register_mc_group" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "nla_reserve" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "skb_put" [drivers/thermal/thermal_sys.ko] undefined!
> 
> Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Zhang Rui <rui.zhang@intel.com>
> ---
>  drivers/thermal/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20101213.orig/drivers/thermal/Kconfig
> +++ linux-next-20101213/drivers/thermal/Kconfig
> @@ -4,6 +4,7 @@
>  
>  menuconfig THERMAL
>  	tristate "Generic Thermal sysfs driver"
> +	depends on NET
>  	help
>  	  Generic Thermal Sysfs driver offers a generic mechanism for
>  	  thermal management. Usually it's made up of one or more thermal
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH -next] thermal: depends on NET

[Len Brown]

> > --- linux-next-20101213.orig/drivers/thermal/Kconfig
> > +++ linux-next-20101213/drivers/thermal/Kconfig
> > @@ -4,6 +4,7 @@
> >  
> >  menuconfig THERMAL
> >  	tristate "Generic Thermal sysfs driver"
> > +	depends on NET

I've added this line to the offending patch.

While I agree that randconfig build testing
is theoretically useful, in recent memory
its results do not seem particularly relevant
to useful configs.

Perhaps it would be a good idea to spend some time
making non-useful configs impossible, and thus focus
the testing where it will be of more benefit?

thanks,
Len Brown, Intel Open Source Technology Center

on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Randy Dunlap]

On 01/11/11 21:18, Len Brown wrote:
>>> --- linux-next-20101213.orig/drivers/thermal/Kconfig
>>> +++ linux-next-20101213/drivers/thermal/Kconfig
>>> @@ -4,6 +4,7 @@
>>>  
>>>  menuconfig THERMAL
>>>  	tristate "Generic Thermal sysfs driver"
>>> +	depends on NET
> 
> I've added this line to the offending patch.

Thank you.

> While I agree that randconfig build testing
> is theoretically useful, in recent memory
> its results do not seem particularly relevant
> to useful configs.

Who defines useful?
"what is good for the goose is not good for the gander"

> Perhaps it would be a good idea to spend some time
> making non-useful configs impossible, and thus focus
> the testing where it will be of more benefit?

We have a plethora of kernel configs, so yes,
I'd be glad to see your efforts in that area.


Here's my take on kernel builds:

Ideally (randconfig) build testing wouldn't be needed
and developers would:

- know what kernel facilities their code uses and #include
  header files for all of them

- know what kernel configs their code uses and make their code
  depend on or select the needed config symbols

- actually read & review build output to look for errors and
  warnings in their code and not ignore them but actually fix them

- use sparse to check for other warnings

The current attitude of "if it builds, then it must be OK"
is not good.


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Len Brown]

> > While I agree that randconfig build testing
> > is theoretically useful, in recent memory
> > its results do not seem particularly relevant
> > to useful configs.
> 
> Who defines useful?

Simple.

Configs that will be used are useful.

Phantom configs that will NEVER be used are NOT useful.

Phantom configs are HARMFUL, as they squander
finite testing and maintainer resources
that should be applied to code that is actually used.

Rather than celebrating our theoretical flexibility
with every new config option, we should recoil at the
fact that each one may up to double the number of
configs that need to be tested and supported.

When I'm answering your nagging e-mail about a build failure
in a phantom config that nobody would even conceive of using,
I'm not using that time to fix somebody's real problem
on a real machine.

I'd rather see you spend your time making select work
to delete an entire category of Kconfig failures,
or simply adding dependencies making phantom configs impossible.

eg. Look in drivers/acpi/Kconfig:

menuconfig ACPI
        bool "ACPI (Advanced Configuration and Power Interface) Support"
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on PCI
        depends on PM
        select PNP

Does all of ACPI technically depend on PCI?
Does all of ACPI technically depend on PM support?
Does all of ACPI technically depend on configuration and PNP?

Theoretically, no.

Do I care about the phantom configs that would be possible
if these false dependencies were not in place.  No,
not until somebody invents such a system,
and may be not even then.

Is there a user out there on LKML who can dream up
a use for one of these phantom configs and claim that
his life will end if he'd prevented from building it?
Sure.  Does he suffer from a total lack of perspective?
Yes.

-Len Brown, Intel Open Source Technology Center

Re: on builds/randconfigs

[Randy Dunlap]

On 01/12/11 10:35, Len Brown wrote:
>>> While I agree that randconfig build testing
>>> is theoretically useful, in recent memory
>>> its results do not seem particularly relevant
>>> to useful configs.
>>
>> Who defines useful?
> 
> Simple.
> 
> Configs that will be used are useful.

Then I suggest that you start deleting non-useful kernel configs.
You can begin in ACPI.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Andrew Morton]

On Wed, 12 Jan 2011 13:35:10 -0500 (EST)
Len Brown <lenb@kernel.org> wrote:

> Do I care about the phantom configs that would be possible
> if these false dependencies were not in place.  No,
> not until somebody invents such a system,
> and may be not even then.
> 
> Is there a user out there on LKML who can dream up
> a use for one of these phantom configs and claim that
> his life will end if he'd prevented from building it?
> Sure.  Does he suffer from a total lack of perspective?
> Yes.

These unusable config combinations should be prevented via Kconfig. 
That prevents users from selecting them, which otherwise adds to
our workload and to theirs.  It also prevents false-positives
during our useful randconfig testing.

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Rafael J. Wysocki]

On Wednesday, January 12, 2011, Andrew Morton wrote:
> On Wed, 12 Jan 2011 13:35:10 -0500 (EST)
> Len Brown <lenb@kernel.org> wrote:
> 
> > Do I care about the phantom configs that would be possible
> > if these false dependencies were not in place.  No,
> > not until somebody invents such a system,
> > and may be not even then.
> > 
> > Is there a user out there on LKML who can dream up
> > a use for one of these phantom configs and claim that
> > his life will end if he'd prevented from building it?
> > Sure.  Does he suffer from a total lack of perspective?
> > Yes.
> 
> These unusable config combinations should be prevented via Kconfig. 
> That prevents users from selecting them, which otherwise adds to
> our workload and to theirs.  It also prevents false-positives
> during our useful randconfig testing.

But it is kind of difficult to achieve IMhO.  For example, there are options
that are only SELECTed if something else is set, but randconfig doesn't seem
to care.

Thanks,
Rafael

Re: on builds/randconfigs

[Len Brown]

> >> Who defines useful?

> > Configs that will be used are useful.

> Then I suggest that you start deleting non-useful kernel configs.
> You can begin in ACPI.

Maybe I wasn't clear in my previous note...

Originally, ACPI did not depend on PCI, PNP, or PM.
Now it does.  That is an 8x reduction in phantom configs.

I'm all ears for ideas on further simplification.

-Len

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Len Brown]

> > These unusable config combinations should be prevented via Kconfig. 
> > That prevents users from selecting them, which otherwise adds to
> > our workload and to theirs.  It also prevents false-positives
> > during our useful randconfig testing.
> 
> But it is kind of difficult to achieve IMhO.  For example, there are options
> that are only SELECTed if something else is set, but randconfig doesn't seem
> to care.

Kconfig select needs to be fixed so that it is not possible to
select something if that something's dependencies are not met.

This long standing issue is independent of randconfig,
but Randy can probably attest that a measurable portion
of the randconfig failures are due to this bug.

-Len Brown, Intel Open Source Technology Center

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Valdis.Kletnieks]

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

On Wed, 12 Jan 2011 16:58:26 EST, Len Brown said:

> Kconfig select needs to be fixed so that it is not possible to
> select something if that something's dependencies are not met.

Amen to that. Got bit by that in the CONFIG_XT_MATCH_REALM thread, it was
trying to do a select on NET_CLS_ROUTE, which depended on NET_SCHED which was
unset...


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

Re: on builds/randconfigs

[Randy Dunlap]

On 01/12/11 13:58, Len Brown wrote:
>>> These unusable config combinations should be prevented via Kconfig. 
>>> That prevents users from selecting them, which otherwise adds to
>>> our workload and to theirs.  It also prevents false-positives
>>> during our useful randconfig testing.
>>
>> But it is kind of difficult to achieve IMhO.  For example, there are options
>> that are only SELECTed if something else is set, but randconfig doesn't seem
>> to care.

s/randconfig/kconfig/


> Kconfig select needs to be fixed so that it is not possible to
> select something if that something's dependencies are not met.
> 
> This long standing issue is independent of randconfig,
> but Randy can probably attest that a measurable portion
> of the randconfig failures are due to this bug.

Certainly.  At least now we have a kconfig warning on this class of
problem.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Stephen Rothwell]

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

Hi all,

On Wed, 12 Jan 2011 16:58:26 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> Kconfig select needs to be fixed so that it is not possible to
> select something if that something's dependencies are not met.

So, should the config step fail if such a thing is attempted, or just not
honour the "select"?

BTW, Linus asked me to investigate the alternative of having "select"
(recursively) automatically set the dependencies if they are not already
set ...

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

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

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Len Brown]

On Thu, 13 Jan 2011, Stephen Rothwell wrote:

> Hi all,
> 
> On Wed, 12 Jan 2011 16:58:26 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
> >
> > Kconfig select needs to be fixed so that it is not possible to
> > select something if that something's dependencies are not met.
> 
> So, should the config step fail if such a thing is attempted, or just not
> honour the "select"?
> 
> BTW, Linus asked me to investigate the alternative of having "select"
> (recursively) automatically set the dependencies if they are not already
> set ...

I expect that users want to interact only with select.

See feature X, enable feature X, and feature X
selects what is necessary to support what the user requested...

user interact with "depends-on", by comparison, is torture.
Users are not offered options unless the options
already have all of their dependencies met.
If they manually edit the config file and enable such
options, make oldconfig magically throws away their choices.
That drives people crazy.

cheers,
Len Brown, Intel Open Source Technology Center

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Steven Rostedt]

On Thu, 2011-01-13 at 11:44 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 12 Jan 2011 16:58:26 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
> >
> > Kconfig select needs to be fixed so that it is not possible to
> > select something if that something's dependencies are not met.
> 
> So, should the config step fail if such a thing is attempted, or just not
> honour the "select"?
> 
> BTW, Linus asked me to investigate the alternative of having "select"
> (recursively) automatically set the dependencies if they are not already
> set ...
> 

What happens if you have foo depends on bar || fib ?

Do you automatically enable bar and fib?

-- Steve

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Stephen Rothwell]

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

Hi Steve,

On Wed, 12 Jan 2011 22:45:40 -0500 Steven Rostedt <rostedt@goodmis.org> wrote:
>
> What happens if you have foo depends on bar || fib ?
> 
> Do you automatically enable bar and fib?

The plan was to error out and let the user decide ... or behave as we do
and just warn?

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

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

Re: on builds/randconfigs (was: [PATCH -next] thermal: depends on NET)

[Linus Torvalds]

On Wed, Jan 12, 2011 at 7:48 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Steve,
>
> On Wed, 12 Jan 2011 22:45:40 -0500 Steven Rostedt <rostedt@goodmis.org> wrote:
>>
>> What happens if you have foo depends on bar || fib ?
>>
>> Do you automatically enable bar and fib?
>
> The plan was to error out and let the user decide ... or behave as we do
> and just warn?

One thing to notice is that a lot of the "a || b" conditionals tend to
be cases where one of the expressions is a known constant 'y'.

In other words, the most common case of "a || b" tends to be things
like "X86 || MIPS || POWER.." or possibly "PCI || ISA", where one of
the options will have been hard-coded by the initial architecture
config file - and would generally not be something that the user sets
at all.

Now that may not be _universally_ true, but a quick grep certainly
supports the notion that that is a very common case.

So I think we want the rule to be:

 - check all entries in the "||" chain - and if one of them is already
set to 'y', then just ignore the dependency as trivially fulfilled

 - if all are 'n' or unknown, error out (or warn)

and I think there won't be all that many cases where people get the
error in practice.

                      Linus

Re: on builds/randconfigs

[Michal Marek]

On 12.1.2011 22:58, Len Brown wrote:
>>> These unusable config combinations should be prevented via Kconfig. 
>>> That prevents users from selecting them, which otherwise adds to
>>> our workload and to theirs.  It also prevents false-positives
>>> during our useful randconfig testing.
>>
>> But it is kind of difficult to achieve IMhO.  For example, there are options
>> that are only SELECTed if something else is set, but randconfig doesn't seem
>> to care.
> 
> Kconfig select needs to be fixed so that it is not possible to
> select something if that something's dependencies are not met.

Right now, it issues a warning in such case. I think changing it to a
fatal error would be too premature, not long ago there were a couple of
annoying false positives.

But from the rest of the thread, I conclude that you actually meant "not
possible to select something if that something's dependencies CANNOT be
met", i.e. automatically select dependencies if that is possible. That
was actually one of the goals of Vegard Nossum's GSoC poject last year,
but I haven't heard of any outcome yet. Vegard, is there something we
could use, be it code or mistakes we could learn from?

Thanks,
Michal

Re: on builds/randconfigs

[Vegard Nossum]

On 13 January 2011 13:23, Michal Marek <mmarek@suse.cz> wrote:
> On 12.1.2011 22:58, Len Brown wrote:
>>>> These unusable config combinations should be prevented via Kconfig.
>>>> That prevents users from selecting them, which otherwise adds to
>>>> our workload and to theirs.  It also prevents false-positives
>>>> during our useful randconfig testing.
>>>
>>> But it is kind of difficult to achieve IMhO.  For example, there are options
>>> that are only SELECTed if something else is set, but randconfig doesn't seem
>>> to care.
>>
>> Kconfig select needs to be fixed so that it is not possible to
>> select something if that something's dependencies are not met.
>
> Right now, it issues a warning in such case. I think changing it to a
> fatal error would be too premature, not long ago there were a couple of
> annoying false positives.
>
> But from the rest of the thread, I conclude that you actually meant "not
> possible to select something if that something's dependencies CANNOT be
> met", i.e. automatically select dependencies if that is possible. That
> was actually one of the goals of Vegard Nossum's GSoC poject last year,
> but I haven't heard of any outcome yet. Vegard, is there something we
> could use, be it code or mistakes we could learn from?

Maybe I am wrong, but doesn't conf_write() actually take care of this
when it does that sym_calc_value() for all the symbols? Or maybe
that's the problem (i.e. that it doesn't).

Current satconfig code can be changed to produce random configs (that
nevertheless respect the user's choices) with a 1-line patch. But
there are some other issues to be worked out, mainly that conf_write()
doesn't respect all the choices that the SAT solver made. There could
be several reasons for that: 1. satconfig doesn't deal with
hex/int/string values and relies on conf_write() to fill in those
(this is a plain old bug), 2. the translation into boolean logic is
subtly wrong, perhaps a corner case or something like that, and/or 3.
conf_write() does something wrong.

I'll be happy to give a tour of the satconfig code if you or anybody
else would like to start hacking on it.


Vegard

Re: on builds/randconfigs

[Michal Marek]

Dne 15.1.2011 13:24, Vegard Nossum napsal(a):
> I'll be happy to give a tour of the satconfig code if you or anybody
> else would like to start hacking on it.

Sure, I'm interested!

Michal