linux-next: Tree for May 22
Subsystems (2)
Hi all,
Changes since 20090521:
New trees:
reiserfs-bkl
fsnotify
I have moved all the -tip trees together (except the x86 tree) and the vfs tree has moved up with all the other fs-related trees.
This tree fails to build for powerpc allyesconfig. The futex affecting merge has been fixed correctly today.
The vfs tree gained a conflict against the reiserfs-bkl tree.
The security-testing tree gained a conflicts against Linus' tree.
The tracing tree gained 2 conflicts against the net tree.
I reverted a commit from the v4l-dvb tree as it is causing build problems.
I remerged the net tree at the end to pick up a warning fix that may have affected tracing at run time.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://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 (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) 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 140 trees (counting Linus' and 18 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 · 182 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/master Merging quilt/driver-core.current Merging quilt/usb.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 dwmw2/master Merging arm/devel Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging mips/mips-for-linux-next Merging parisc/master Merging powerpc/next Merging 4xx/next Merging galak/next Merging pxa/for-next CONFLICT (content): Merge conflict in arch/arm/mach-pxa/viper.c Merging s390/features Merging sh/master Merging sparc/master Merging x86/auto-x86-next Merging xtensa/master Merging configfs/linux-next Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging v9fs/for-next CONFLICT (content): Merge conflict in net/9p/protocol.c Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 Merging vfs/for-next CONFLICT (content): Merge conflict in fs/ext4/super.c CONFLICT (content): Merge conflict in fs/fuse/inode.c CONFLICT (content): Merge conflict in fs/reiserfs/super.c Merging pci/linux-next Merging quilt/device-mapper Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging quota/for_next Merging kbuild/master [master cadcdb5] Revert "initconst adjustments" Merging ide/for-next Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master Merging dlm/next Merging scsi/master Merging async_tx/next Merging udf/for_next Merging net/master CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h Merging wireless/master [master 557639b] Revert "rfkill: remove user_claim stuff" Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Merging cifs/master Merging mmc/next Merging input/next Merging bkl-removal/bkl-removal Merging lsm/for-next Merging block/for-next CONFLICT (content): Merge conflict in drivers/block/hd.c CONFLICT (content): Merge conflict in drivers/block/mg_disk.c CONFLICT (content): Merge conflict in drivers/ide/ide-atapi.c CONFLICT (content): Merge conflict in drivers/ide/ide-cd.c CONFLICT (content): Merge conflict in drivers/ide/ide-floppy.c CONFLICT (content): Merge conflict in drivers/ide/ide-tape.c Merging embedded/master Merging firmware/master Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next CONFLICT (content): Merge conflict in fs/exec.c Merging lblnet/master Merging quilt/ttydev Merging agp/agp-next Merging tip-core/auto-core-next CONFLICT (content): Merge conflict in kernel/futex.c Merging cpus4096/auto-cpus4096-next Merging tracing/auto-tracing-next CONFLICT (content): Merge conflict in net/core/drop_monitor.c CONFLICT (content): Merge conflict in net/core/net-traces.c Merging genirq/auto-genirq-next CONFLICT (content): Merge conflict in arch/mips/sibyte/bcm1480/irq.c CONFLICT (content): Merge conflict in arch/mips/sibyte/sb1250/irq.c Merging safe-poison-pointers/auto-safe-poison-pointers-next Merging sched/auto-sched-next Merging stackprotector/auto-stackprotector-next Merging timers/auto-timers-next Merging generic-ipi/auto-generic-ipi-next Merging oprofile/auto-oprofile-next Merging fastboot/auto-fastboot-next Merging sparseirq/auto-sparseirq-next Merging iommu/auto-iommu-next Merging uwb/for-upstream Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging omap/for-next Merging quilt/aoe Merging kmemleak/kmemleak CONFLICT (delete/modify): arch/x86/kernel/vmlinux_32.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_32.lds.S left in tree. CONFLICT (delete/modify): arch/x86/kernel/vmlinux_64.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_64.lds.S left in tree. CONFLICT (content): Merge conflict in lib/Kconfig.debug CONFLICT (content): Merge conflict in mm/slob.c $ git rm -f arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S Merging suspend/linux-next Merging bluetooth/master Merging edac-amd/for-next Merging fsnotify/for-next Merging asm-generic/next Merging quilt/driver-core CONFLICT (content): Merge conflict in init/main.c Merging quilt/usb CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c Merging quilt/staging CONFLICT (content): Merge conflict in drivers/staging/rt2860/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt2870/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt3070/common/mlme.c Merging net-tmp [master ae58c6b] Revert "V4L/DVB (11673): v4l2-device: unregister i2c_clients when unregistering the v4l2_device." Merging scsi-post-merge/master CONFLICT (content): Merge conflict in include/Kbuild
Re: linux-next: Tree for May 22 (staging/)
Quoted 3 lines · Stephen Rothwell
Hi all,
Changes since 20090521:
Saw these build warnings on x86_64:
drivers/staging/agnx/pci.c:64:3: warning: "/*" within comment drivers/staging/agnx/pci.c:223:2: warning: "/*" within comment
drivers/staging/slicoss/slicoss.c:1875:warning: unused variable 'failure' drivers/staging/stlc45xx/stlc45xx.c:2240: warning: 'struct ieee80211_if_conf' declared inside parameter list drivers/staging/stlc45xx/stlc45xx.c:2240: warning: its scope is only this definition or declaration, which is probably not what you want drivers/staging/stlc45xx/stlc45xx.c:2248: error: dereferencing pointer to incomplete type drivers/staging/stlc45xx/stlc45xx.c:2248: error: dereferencing pointer to incomplete type drivers/staging/stlc45xx/stlc45xx.c:2360: error: unknown field 'config_interface' specified in initializer drivers/staging/stlc45xx/stlc45xx.c:2522: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int' drivers/staging/stlc45xx/stlc45xx.c:2524: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int' drivers/staging/stlc45xx/stlc45xx.c:2524: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
drivers/staging/rt3070/common/../../rt2870/common/../../rt2860/common/spectrum.c:1577: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' drivers/staging/rt3070/../rt2870/../rt2860/rt_linux.c:841: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
There are also 2 outstanding patches for comedi build failures that need to be applied so that more work can be done on comedi....
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/
PATCH 1/1 cpc-usb: fix PROC_FS dependency
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
The proper way to check for and enforce a kconfig symbol dependency is via Kconfig files, not by using #error in a source file followed by 9 other compile errors.
--- drivers/staging/cpc-usb/Kconfig | 2 +- drivers/staging/cpc-usb/cpc-usb_drv.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/staging/cpc-usb/cpc-usb_drv.c +1 -9
@@ -27,12 +27,8 @@#include <linux/completion.h> #include <asm/uaccess.h> #include <linux/usb.h> -#include <linux/version.h> - -#ifdef CONFIG_PROC_FS -# include <linux/proc_fs.h> -#endif +#include <linux/proc_fs.h> #include "cpc.h"
@@ -57,10 +53,6 @@ MODULE_LICENSE("GPL v2");#define USB_CPCUSB_M16C_PRODUCT_ID 0x0888#define USB_CPCUSB_LPC2119_PRODUCT_ID 0x0444 -#ifndef CONFIG_PROC_FS -#error "PROCFS needed" -#endif -#define CPC_USB_PROC_DIR CPC_PROC_DIR "cpc-usb"static struct proc_dir_entry *procDir;
drivers/staging/cpc-usb/Kconfig +1 -1
@@ -1,4 +1,4 @@ config USB_CPC tristate "CPC CAN USB driver" - depends on USB + depends on USB && PROC_FS default n
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/
Re: [PATCH -next] cpc-usb: fix PROC_FS dependency
Quoted 43 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
The proper way to check for and enforce a kconfig symbol dependency is via
Kconfigfiles, not by using #error in a source file followed by 9 other compile errors.Signed-off-by Randy Dunlap <[email protected]>Cc Sebastian Haas <[email protected]>--- drivers/staging/cpc-usb/Kconfig | 2 +- drivers/staging/cpc-usb/cpc-usb_drv.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-)drivers/staging/cpc-usb/cpc-usb_drv.c +1
-9@@ -27,12 +27,8 @@#include <linux/completion.h> #include <asm/uaccess.h> #include <linux/usb.h> -#include <linux/version.h> - -#ifdef CONFIG_PROC_FS -# include <linux/proc_fs.h> -#endif +#include <linux/proc_fs.h> #include "cpc.h" @@ -57,10 +53,6 @@ MODULE_LICENSE("GPL v2");#define USB_CPCUSB_M16C_PRODUCT_ID 0x0888#define USB_CPCUSB_LPC2119_PRODUCT_ID 0x0444 -#ifndef CONFIG_PROC_FS -#error "PROCFS needed" -#endif -#define CPC_USB_PROC_DIR CPC_PROC_DIR "cpc-usb"static struct proc_dir_entry *procDir;
drivers/staging/cpc-usb/Kconfig line 4
Quoted 5 lines
drivers/staging/cpc-usb/Kconfig +1
-1@@ -1,4 +1,4 @@ config USB_CPC tristate "CPC CAN USB driver" - depends on USB + depends on USB && PROC_FS default n
BTW, I'm surprised that there is no NET or CAN dependency here.
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/
Re: [PATCH -next] cpc-usb: fix PROC_FS dependency
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 40 lines · Randy Dunlap
Quoted 39 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
The proper way to check for and enforce a kconfig symbol dependency is via
Kconfigfiles, not by using #error in a source file followed by 9 other compile errors.Signed-off-by Randy Dunlap <[email protected]>Cc Sebastian Haas <[email protected]>--- drivers/staging/cpc-usb/Kconfig | 2 +- drivers/staging/cpc-usb/cpc-usb_drv.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-)drivers/staging/cpc-usb/cpc-usb_drv.c +1
-9@@ -27,12 +27,8 @@#include <linux/completion.h> #include <asm/uaccess.h> #include <linux/usb.h> -#include <linux/version.h> - -#ifdef CONFIG_PROC_FS -# include <linux/proc_fs.h> -#endif +#include <linux/proc_fs.h> #include "cpc.h" @@ -57,10 +53,6 @@ MODULE_LICENSE("GPL v2");#define USB_CPCUSB_M16C_PRODUCT_ID 0x0888#define USB_CPCUSB_LPC2119_PRODUCT_ID 0x0444 -#ifndef CONFIG_PROC_FS -#error "PROCFS needed" -#endif -#define CPC_USB_PROC_DIR CPC_PROC_DIR "cpc-usb"
Quoted 11 lines
drivers/staging/cpc-usb/Kconfig line 4
Quoted 9 lines
drivers/staging/cpc-usb/cpc-usb_drv.c +0
-0static struct proc_dir_entry *procDir;drivers/staging/cpc-usb/Kconfig +1
-1@@ -1,4 +1,4 @@ config USB_CPC tristate "CPC CAN USB driver" - depends on USB + depends on USB && PROC_FS default nBTW, I'm surprised that there is no NET or CAN dependency here.
Yes, you are right. But there are no dependencies yet. As soon as the driver starts to support SocketCAN, we need to add this dependency.
- --
Mit freundlichen Gruessen/Best Regards,
Sebastian Haas
Software Entwicklung/Software Development
Phone: +49-9451-9432-22
Fax : +49-9451-9432-12
Email: [email protected]
Web : www.ems-wuensche.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkoaI9sACgkQpqRB8PJG7XzKAgCfWhjQeeFG+qXLoOQHM0hy0sw2 iK8An08cPNYEP5qEA/ex5KGjZm71keBq
=Fxlt
-----END PGP SIGNATURE-----
Signature · 7 lines
EMS Dr. Thomas Wuensche e.K. Sonnenhang 3 85304 Ilmmuenster HRA Neuburg a.d. Donau, HR-Nr. 70.106 Phone: +49-8441-490260 Fax : +49-8441-81860 http://www.ems-wuensche.com