linux-next: Tree for December 14
Subsystems (8)
Hi all,
My usual call for calm: please do not put stuff destined for 2.6.34 into linux-next trees until after 2.6.33-rc1.
Changes since 20091211:
Since Linus is now merging trees into his, various conflicts move from tree to tree.
The net-current tree lost its conflict.
The md-current tree gained a conflict against Linus' tree.
The 52xx-and-virtex gained a build failure for which I applied a patch.
The pci tree lost its conflicts.
The kbuild tree lost its merge fix.
The acpi tree gained a build failure so I used the version from next-20091211.
The cpufreq tree lost its conflict.
The devicetree tree gained a build failure for which I reverted several commits.
The limits tree gained 3 conflicts against Linus' tree.
The omap_dss2 tree lost its conflict.
The percpu tree gained a conflict against the tip tree.
The tty tree lost its conflict.
The usb tree lost its conflict and build failure.
The staging 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 155 trees (counting Linus' and 22 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
Signature · 227 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 CONFLICT (content): Merge conflict in fs/compat_ioctl.c Merging audit-current/for-linus Merging crypto-current/master Merging ide-curent/master Merging dwmw2/master Merging arm/devel Merging davinci/davinci-next Merging msm/for-next Merging omap/for-next Merging pxa/for-next Merging samsung/next-samsung Merging avr32/avr32-arch CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next CONFLICT (content): Merge conflict in arch/m68k/include/asm/ptrace.h Merging microblaze/next Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/Kconfig CONFLICT (content): Merge conflict in arch/mips/Makefile CONFLICT (content): Merge conflict in arch/mips/include/asm/ftrace.h CONFLICT (add/add): Merge conflict in arch/mips/kernel/ftrace.c CONFLICT (add/add): Merge conflict in arch/mips/kernel/mcount.S CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile CONFLICT (content): Merge conflict in scripts/recordmcount.pl Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging ceph/for-next Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next Merging ext3/for_next Merging ext4/next 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 CONFLICT (add/add): Merge conflict in fs/9p/cache.c Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in include/acpi/processor.h $ git reset --hard HEAD^ Merging refs/next/20091211/acpi CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in include/acpi/processor.h Merging ieee1394/for-next CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-1394.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-fw.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv.h Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master Merging wireless/master Merging mtd/master CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c CONFLICT (delete/modify): drivers/mtd/nand/excite_nandflash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/nand/excite_nandflash.c left in tree. CONFLICT (content): Merge conflict in drivers/mtd/nand/pxa3xx_nand.c CONFLICT (content): Merge conflict in kernel/printk.c $ git rm -f drivers/mtd/nand/excite_nandflash.c Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Applying: modpost: autoconf.h has moved to include/generated Applying: rr: cpufreq: fix up for api name change Merging mmc/next Merging tmio-mmc/linux-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 CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fb_helper.c Merging voltage/for-next CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile 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 (content): Merge conflict in arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in fs/afs/write.c CONFLICT (content): Merge conflict in fs/cifs/dir.c CONFLICT (content): Merge conflict in fs/ubifs/file.c CONFLICT (content): Merge conflict in include/asm-generic/fcntl.h CONFLICT (content): Merge conflict in include/net/compat.h CONFLICT (content): Merge conflict in net/compat.c CONFLICT (content): Merge conflict in net/socket.c Merging irda/for-next CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Merging hwlat/for-linus CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging drbd/for-jens Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging devicetree/next-devicetree Merging spi/next-spi Merging limits/writable_limits CONFLICT (content): Merge conflict in arch/ia64/kernel/sys_ia64.c CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in include/asm-generic/unistd.h CONFLICT (content): Merge conflict in mm/mremap.c Merging omap_dss2/for-next Merging tip/auto-latest CONFLICT (content): Merge conflict in kernel/sysctl.c Merging edac-amd/for-next Merging oprofile/for-next Merging percpu/for-next CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_cacheinfo.c CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c CONFLICT (content): Merge conflict in mm/slab.c Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison CONFLICT (content): Merge conflict in MAINTAINERS Merging sysctl/master Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master Applying: powerpc: fix up for mmu_mapin_ram api change [master aeff606] Revert "of: unify phandle name in struct device_node" [master 238ae94] Revert "microblaze: gut implementation of early_init_dt_scan_cpus()" [master 2000b13] Revert "of: merge of_attach_node() & of_detach_node()" [master ae6cf43] Revert "of: Merge of_node_get() and of_node_put()" [master 4cb51b3] Revert "of: merge machine_is_compatible()" [master 5407df6] Revert "of/flattree: merge early_init_devtree() and early_init_move_devtree()"
PATCH 1/1 staging/vt66*: kconfig, depends on WLAN
From: Randy Dunlap <[email protected]>
The vt665[56] drivers can be built when CONFIG_NET=n & CONFIG_NETDEVICES=n or just when CONFIG_WLAN=n. This leads to build failures.
Prevent this by making them depend on WLAN.
[This patch was lost in a dualing trees merge; still needs to be re-applied.]
--- drivers/staging/vt6655/Kconfig | 2 +- drivers/staging/vt6656/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vt6655/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6655 tristate "VIA Technologies VT6655 support" - depends on PCI + depends on PCI && WLAN select WIRELESS_EXT select WEXT_PRIV ---help---
drivers/staging/vt6656/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6656 tristate "VIA Technologies VT6656 support" - depends on USB + depends on USB && WLAN select WIRELESS_EXT select WEXT_PRIV ---help---
[email protected]
Appliedpatch staging-vt66-kconfig-depends-on-wlan.patch added to gregkh-2.6 tree
This is a note to let you know that I've just added the patch titled
Subject: Staging/vt66*: kconfig, depends on WLAN
to my gregkh-2.6 tree. Its filename is
staging-vt66-kconfig-depends-on-wlan.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Quoted 1 line
From [email protected] Fri Dec 18 10:31:37 2009
From: Randy Dunlap <[email protected]>
Date: Mon, 14 Dec 2009 08:44:46 -0800
Subject: Staging/vt66*: kconfig, depends on WLAN
To: Stephen Rothwell <[email protected]>, [email protected]
Cc: [email protected], LKML <[email protected]>
Message-ID: <[email protected]>
From: Randy Dunlap <[email protected]>
The vt665[56] drivers can be built when CONFIG_NET=n & CONFIG_NETDEVICES=n or just when CONFIG_WLAN=n. This leads to build failures.
Prevent this by making them depend on WLAN.
[This patch was lost in a dualing trees merge;
still needs to be re-applied.]
--- drivers/staging/vt6655/Kconfig | 2 +- drivers/staging/vt6656/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vt6655/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6655 tristate "VIA Technologies VT6655 support" - depends on PCI + depends on PCI && WLAN select WIRELESS_EXT select WEXT_PRIV ---help---
drivers/staging/vt6656/Kconfig +1 -1
@@ -1,6 +1,6 @@ config VT6656 tristate "VIA Technologies VT6656 support" - depends on USB + depends on USB && WLAN select WIRELESS_EXT select WEXT_PRIV ---help---
PATCH 1/1 radio/si470x: #include <sched.h>
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Driver needs to #include <sched.h>:
drivers/media/radio/si470x/radio-si470x-common.c:452: error: 'TASK_INTERRUPTIBLE' undeclared (first use in this function) drivers/media/radio/si470x/radio-si470x-common.c:452: error: implicit declaration of function 'signal_pending' drivers/media/radio/si470x/radio-si470x-common.c:452: error: implicit declaration of function 'schedule'
--- drivers/media/radio/si470x/radio-si470x.h | 1 + 1 file changed, 1 insertion(+)
drivers/media/radio/si470x/radio-si470x.h +1 -0
@@ -29,6 +29,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/smp_lock.h> #include <linux/input.h>
PATCH 1/1 fs: fix compat_ioctl build for CONFIG_BLOCK=n
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix build failure when CONFIG_BLOCK=n:
fs/compat_ioctl.c:1604: error: 'SG_SET_TRANSFORM' undeclared
--- fs/compat_ioctl.c | 2 ++ 1 file changed, 2 insertions(+)
fs/compat_ioctl.c +2 -0
@@ -1600,8 +1600,10 @@ static long do_ioctl_trans(int fd, unsigcase KDSKBMETA :case KDSKBLED :case KDSETLED : +#ifdef CONFIG_BLOCK /* SG stuff */ case SG_SET_TRANSFORM : +#endif /* AUTOFS */ case AUTOFS_IOC_READY :case AUTOFS_IOC_FAIL :
Re: [PATCH -next] fs: fix compat_ioctl build for CONFIG_BLOCK=n
Quoted 8 lines · On Monday 14 December 2009 17:10:05 Randy Dunlap wrote:
From: Randy Dunlap <[email protected]>
Fix build failure when
CONFIG_BLOCK=n:
fs/compat_ioctl.c:1604: error: 'SG_SET_TRANSFORM' undeclaredSigned-off-by Randy Dunlap <[email protected]>
Your patch is obviously correct, but I wonder if we could just drop the line completely, given that no driver in the kernel actually implements this ioctl command. It was part of the ide-scsi driver until 2.6.28, but that driver was removed in 2.6.29.
Arnd
Re: [PATCH -next] fs: fix compat_ioctl build for CONFIG_BLOCK=n
Quoted 6 lines · On Mon, 14 Dec 2009 20:16:13 +0000 Arnd Bergmann wrote:
Quoted 5 lines · On Monday 14 December 2009 17:10:05 Randy Dunlap wrote:
From: Randy Dunlap <[email protected]>
Fix build failure when
CONFIG_BLOCK=n:
Quoted 8 lines
Quoted 3 lines
fs/compat_ioctl.c:1604: error: 'SG_SET_TRANSFORM' undeclaredSigned-off-by Randy Dunlap <[email protected]>Your patch is obviously correct, but I wonder if we could just drop the line completely, given that no driver in the kernel actually implements this ioctl command. It was part of the ide-scsi driver until 2.6.28, but that driver was removed in 2.6.29.
I checked with Jens, he says yes, drop that case. Do you want to do that or should I send another patch?
thanks,
---
~Randy
Re: linux-next: Tree for December 14 (nouveau & AGP)
In reply to Stephen Rothwellwhen CONFIG_AGP=n:
drivers/gpu/drm/nouveau/nouveau_bo.c:315: error: implicit declaration of function 'ttm_agp_backend_init'
BTW:
menuconfig AGP
tristate "/dev/agpgart (AGP Support)" depends on ALPHA || IA64 || PARISC || PPC || X86 depends on PCI
Can AGP=m? It's tristate in kconfig, but all of its dependencies are booleans.
---
~Randy
PATCH 1/1 nouveau: fix ch7006 build
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
The ch7006 driver could be built even when nouveau was not enabled, but the build fails in that case, so make it depend on DRM_NOUVEUA.
Also make the I2c encoder/helper chips menu depend on I2C (no build error, just visual inspection).
ERROR: "drm_helper_probe_single_connector_modes" [drivers/gpu/drm/i2c/ch7006.ko] undefined!
--- drivers/gpu/drm/nouveau/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/Kconfig +3 -2
@@ -30,11 +30,12 @@ config DRM_NOUVEAU_DEBUG via debugfs. menu "I2C encoder or helper chips" - depends on DRM + depends on DRM && I2C config DRM_I2C_CH7006 tristate "Chrontel ch7006 TV encoder" - default m if DRM_NOUVEAU + depends on DRM_NOUVEAU + default m help Support for Chrontel ch7006 and similar TV encoders, found on some nVidia video cards.