linux-next: Tree for May 22
Subsystems (5)
Hi all,
We are in the merge window again. I remind you all not to add stuff for 2.6.36 to your linux-next trees until after 2.6.35-rc1.
This tree has not had the same build testing as usual - it has only been built after all the trees were merged.
Changes since 20100521:
My fixes tree contains:
hid: fix hid-roccat-kone for bin_attr API change
v4l-dvb: update gfp/slab.h includes
arm: update gfp/slab.h includes
davinci: update gfp/slab.h includes
ocfs2: update gfp/slab.h includes
wireless: update gfp/slab.h includes
The crypto-current tree lost its conflict.
The omap tree lost its conflict.
The mips tree lost its conflict.
The ext3 tree gained a conflict against Linus' tree.
The ext4 tree gained conflicts against the ext3 tree and Linus' tree.
The net tree lost its conflicts.
The mtd tree lost its conflict.
The rr tree gained a conflict against Linus' tree.
The block tree lost its conflicts.
The md tree lost its conflict.
The driver-core tree lost its conflicts.
The tty tree lost its conflict.
The usb tree lost its conflicts.
The staging-next tree lost its conflicts.
----------------------------------------------------------------------------
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 162 trees (counting Linus' and 22 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross 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 · 191 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 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 avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h CONFLICT (content): Merge conflict in scripts/mod/file2alias.c Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next Merging galak/next Merging s390/features Merging sh/master Merging genesis/master Merging sparc/master Merging xtensa/master Merging ceph/for-next Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next CONFLICT (content): Merge conflict in fs/ecryptfs/main.c Merging ext3/for_next CONFLICT (content): Merge conflict in fs/super.c Merging ext4/next CONFLICT (content): Merge conflict in fs/ext4/fsync.c CONFLICT (content): Merge conflict in fs/ext4/super.c CONFLICT (content): Merge conflict in include/linux/quotaops.h Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging logfs/master Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-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 CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c 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 Applying: acpi: update gfp/slab.h includes Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging ibft/master Merging scsi/master Merging async_tx/next Merging net/master Merging wireless/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr CONFLICT (content): Merge conflict in drivers/net/virtio_net.c CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/if_usb.c CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/r8180_core.c Merging mmc/next 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 Merging backlight/for-mm Merging kgdb/kgdb-next CONFLICT (add/add): Merge conflict in kernel/debug/kdb/kdb_main.c Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next CONFLICT (content): Merge conflict in drivers/dma/Makefile CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c Merging hdlc/hdlc-next Merging drm/drm-next Merging viafb/viafb-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master Merging agp/agp-next Merging uwb/for-upstream Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree. $ git rm -f fs/notify/inotify/inotify.c Applying: fsnotify: update gfp/slab.h includes Merging irda/for-next CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Merging drbd/for-jens Merging catalin/for-next Merging alacrity/linux-next Merging i7core_edac/linux_next Merging devicetree/next-devicetree CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c CONFLICT (content): Merge conflict in drivers/net/gianfar.c CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c Applying: fixup arch/powerpc/kernel/vio.c Merging spi/next-spi Merging omap_dss2/for-next Merging tip/auto-latest CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in kernel/Makefile Merging edac-amd/for-next Merging oprofile/for-next Merging percpu/for-next Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging sysctl/master Merging bkl-core/bkl/core Merging bkl-procfs/bkl/procfs Merging bkl-ioctl/bkl/ioctl Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Merging staging-next/staging-next Merging slabh/slabh Merging scsi-post-merge/master
PATCH 1/1 x86/platform: classmate-laptop depends on RFKILL
From: Randy Dunlap <[email protected]>
classmate-laptop uses rfkill interfaces, so it should depend on RFKILL. Otherwise, when CONFIG_RFKILL=m, these build errors happen:
classmate-laptop.c:(.text+0x54b4f2): undefined reference to rfkill_unregister' classmate-laptop.c:(.text+0x54b508): undefined reference to rfkill_destroy' classmate-laptop.c:(.text+0x54b71a): undefined reference to rfkill_alloc' classmate-laptop.c:(.text+0x54b739): undefined reference to rfkill_register' classmate-laptop.c:(.text+0x54b761): undefined reference to rfkill_destroy' classmate-laptop.c:(.text+0x54b841): undefined reference to rfkill_set_sw_state'
--- drivers/platform/x86/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/Kconfig +1 -0
@@ -520,6 +520,7 @@ config TOSHIBA_BT_RFKILL config ACPI_CMPC tristate "CMPC Laptop Extras" depends on X86 && ACPI + depends on RFKILL select INPUT select BACKLIGHT_CLASS_DEVICE default n
PATCH 1/1 classmate-laptop: depends on RFKILL or RFKILL=n
Randy Dunlap has reported that building classmate-laptop fails when CONFIG_RFKILL=m and CONFIG_ACPI_CMPC=y. He suggested depending on RFKILL, but, then, it will not be possible to select classmate-laptop when RFKILL is off. There's no known problem with building and using classmate-laptop with RFKILL off. So depend on RFKILL or RFKILL=n.
--- drivers/platform/x86/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/platform/x86/Kconfig +1 -0
@@ -520,6 +520,7 @@ config TOSHIBA_BT_RFKILL config ACPI_CMPC tristate "CMPC Laptop Extras" depends on X86 && ACPI + depends on RFKILL || RFKILL=n select INPUT select BACKLIGHT_CLASS_DEVICE default n
Signature · 1 line
1.7.1
Matthew Garrett
AppliedRe: [PATCH] classmate-laptop: depends on RFKILL or RFKILL=n
Applied, thanks.
Signature · 1 line
Matthew Garrett | [email protected]
PATCH 1/1 platform/x86: msi-laptop depends on SERIO_I8042
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
msi-laptop uses i8042_*() interfaces, so it should depend on SERIO_I8042. E.g., when SERIO_I8042=m and MSI_LAPTOP=y:
msi-laptop.c:(.text+0x18a7fe): undefined reference to i8042_install_filter' msi-laptop.c:(.init.text+0xd69d): undefined reference to i8042_remove_filter' msi-laptop.c:(.exit.text+0x19c3): undefined reference to `i8042_remove_filter'
--- drivers/platform/x86/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/Kconfig +1 -0
@@ -151,6 +151,7 @@ config MSI_LAPTOP depends on ACPI depends on BACKLIGHT_CLASS_DEVICE depends on RFKILL + depends on SERIO_I8042 ---help--- This is a driver for laptops built by MSI (MICRO-STAR INTERNATIONAL):
Matthew Garrett
AppliedRe: [PATCH -next] platform/x86: msi-laptop depends on SERIO_I8042
Applied, thanks.
Signature · 1 line
Matthew Garrett | [email protected]
PATCH 1/1 nouveau: fix acpi_lid_open undefined
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
When CONFIG_ACPI_BUTTON=m (and probably when ACPI_BUTTON is not enabled) and NOUVEAU is built-in (not as a loadable module):
nouveau_connector.c:(.text+0xe17ce): undefined reference to `acpi_lid_open'
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -1
@@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_connif (nv_encoder && nv_connector->native_mode) {unsigned status = connector_status_connected; -#ifdef CONFIG_ACPI +#if defined(CONFIG_ACPI_BUTTON ) || \ + (defined(CONFIG_ACPI_BUTTON_MODULE ) && defined(MODULE ))if (!nouveau_ignorelid && !acpi_lid_open ()) status = connector_status_unknown;#endif
Re: [PATCH -next] nouveau: fix acpi_lid_open undefined
Quoted 8 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
When
CONFIG_ACPI_BUTTON=m(and probably whenACPI_BUTTONis not enabled) and NOUVEAU is built-in (not as a loadable module):nouveau_connector.c:(.text+0xe17ce): undefined reference to `acpi_lid_open'
Signed-off-by Randy Dunlap <[email protected]>
Quoted 18 lines
Cc David Airlie <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/nouveau/nouveau_connector.c +2
-1@@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_connif (nv_encoder && nv_connector->native_mode) {unsigned status = connector_status_connected; -#ifdef CONFIG_ACPI +#if defined(CONFIG_ACPI_BUTTON ) || \ + (defined(CONFIG_ACPI_BUTTON_MODULE ) && defined(MODULE ))if (!nouveau_ignorelid && !acpi_lid_open ()) status = connector_status_unknown;#endif
Re: [PATCH -next] nouveau: fix acpi_lid_open undefined
In reply to Randy DunlapQuoted 4 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
When
CONFIG_ACPI_BUTTON=m(and probably whenACPI_BUTTONis not enabled) and NOUVEAU is built-in (not as a loadable module):
Won't this result in a behavioural difference? The desirable outcome is that that configuration be impossible, not for that configuration to build but be buggy.
Signature · 1 line
Matthew Garrett | [email protected]
Re: [PATCH -next] nouveau: fix acpi_lid_open undefined
Quoted 7 lines · Matthew Garrett
Quoted 4 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
When
CONFIG_ACPI_BUTTON=m(and probably whenACPI_BUTTONis not enabled) and NOUVEAU is built-in (not as a loadable module):Won't this result in a behavioural difference? The desirable outcome is
It could, yes.
Quoted 2 lines
that that configuration be impossible, not for that configuration to build but be buggy.
so nouveau should depend on (or select, if ACPI is enabled) ACPI_BUTTON?
Signature · 2 lines
~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: [PATCH -next] nouveau: fix acpi_lid_open undefined
Quoted 9 lines · Randy Dunlap
Quoted 1 line · Matthew Garrett
Won't this result in a behavioural difference? The desirable outcome is
It could, yes.
Quoted 2 lines
that that configuration be impossible, not for that configuration to build but be buggy.
so nouveau should depend on (or select, if ACPI is enabled)
ACPI_BUTTON?
There's an argument that it doesn't need to depend on it, but if button is a module then nouveau has to be. Except the inverse isn't true. Kconfig is hard, let's weep gently.
Signature · 1 line
Matthew Garrett | [email protected]
Re: [PATCH -next] nouveau: fix acpi_lid_open undefined
Quoted 6 lines · Matthew Garrett
Quoted 5 lines · Randy Dunlap
Quoted 1 line · Matthew Garrett
Won't this result in a behavioural difference? The desirable outcome is
It could, yes.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
that that configuration be impossible, not for that configuration to build but be buggy.
so nouveau should depend on (or select, if ACPI is enabled)
ACPI_BUTTON?There's an argument that it doesn't need to depend on it, but if button is a module then nouveau has to be. Except the inverse isn't true.
Kconfigis hard, let's weep gently.
Maybe Dave can weep with us when he is back at work...
Signature · 2 lines
~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: [PATCH -next] nouveau: fix acpi_lid_open undefined
Quoted 10 lines · Randy Dunlap
Quoted 9 lines · Matthew Garrett
Quoted 8 lines · Randy Dunlap
Quoted 1 line · Matthew Garrett
Won't this result in a behavioural difference? The desirable outcome is
It could, yes.
Quoted 2 lines
that that configuration be impossible, not for that configuration to build but be buggy.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
so nouveau should depend on (or select, if ACPI is enabled)
ACPI_BUTTON?There's an argument that it doesn't need to depend on it, but if button is a module then nouveau has to be. Except the inverse isn't true.
Kconfigis hard, let's weep gently.Maybe Dave can weep with us when he is back at work...
Yeah I've had problems like this a few times lately with the drm, I'm torn between just adding select all over the place, or assuming someone sane is configuring the kernel.
I'm sort of erring on the someone sane is configuring the kernel just because Linus's objects to "default y" things seems to point at that we can't really give pointers to the people who haven't done it before. So I'm quite happy to leave it having different behaviour depending on the configuration and simply ignoring bug reports from incompetents.
Dave.
Re: [PATCH -next] nouveau: fix acpi_lid_open undefined
Hi.
Quoted 23 lines · Dave Airlie
Quoted 10 lines · Randy Dunlap
Quoted 9 lines · Matthew Garrett
Quoted 8 lines · Randy Dunlap
Quoted 1 line · Matthew Garrett
Won't this result in a behavioural difference? The desirable outcome is
It could, yes.
Quoted 2 lines
that that configuration be impossible, not for that configuration to build but be buggy.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
so nouveau should depend on (or select, if ACPI is enabled)
ACPI_BUTTON?There's an argument that it doesn't need to depend on it, but if button is a module then nouveau has to be. Except the inverse isn't true.
Kconfigis hard, let's weep gently.Maybe Dave can weep with us when he is back at work...
Yeah I've had problems like this a few times lately with the drm, I'm torn between just adding select all over the place, or assuming someone sane is configuring the kernel.
Quoted 5 lines
I'm sort of erring on the someone sane is configuring the kernel just because Linus's objects to "default y" things seems to point at that we can't really give pointers to the people who haven't done it before. So I'm quite happy to leave it having different behaviour depending on the configuration and simply ignoring bug reports from incompetents.
'scuse me for butting in, but would you at least consider adding something to the help for the Nouveau and/or ACPI button options? You might have a sane person configuring the kernel, but that doesn't mean a dependency like this would necessarily be obvious to them.
Personally, I'd argue for the select.
Regards,
Nigel