linux-next: Tree for October 28
Subsystems (4)
Hi all,
[The kernel.org mirroring seems to be lagging a bit today ...]
Changes since 20091027:
Removed tree: quota (at the maintainers request)
My fixes tree contains a build fix for powerpc/kvm.
The sh tree gained a conflict against the powerpc-merge tree.
The block tree still has a build failure so I used the version from next-20091026.
The tip tree gained a conflict against the kgdb tree.
----------------------------------------------------------------------------
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 145 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 · 179 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/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 arm/devel Merging davinci/davinci-next Merging omap/for-next Merging pxa/for-next Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next CONFLICT (content): Merge conflict in drivers/rtc/Kconfig Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next Merging parisc/next Merging powerpc/next Merging 4xx/next Merging galak/next Merging s390/features Merging sh/master CONFLICT (content): Merge conflict in fs/Kconfig 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 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 reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging kbuild/master Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree. $ git rm -f drivers/net/sfc/sfe4001.c Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c Merging wireless/master CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Merging mmc/next Merging tmio-mmc/linux-next Merging input/next Merging lsm/for-next Merging block/for-next $ git reset --hard HEAD^ Merging refs/next/20091026/block 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 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 CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile Merging security-testing/next CONFLICT (content): Merge conflict in Documentation/dontdiff 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 CONFLICT (content): Merge conflict in drivers/acpi/video_detect.c Merging audit/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next Merging irda/for-next Merging hwlat/for-linus CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging drbd/for-jens CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c CONFLICT (add/add): Merge conflict in include/linux/drbd.h Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in drivers/net/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging devicetree/next-devicetree Merging limits/writable_limits Merging tip/auto-latest CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c Merging oprofile/for-next Merging percpu/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Merging quilt/staging CONFLICT (content): Merge conflict in drivers/net/wireless/Kconfig Applying: staging: merge fixup for wireless drivers move Merging scsi-post-merge/master
PATCH 1/1 tpm: fix header for modular build
From: Randy Dunlap <[email protected]>
Fix build for TCG_TPM=m. Header file doesn't handle this and incorrectly builds stubs.
drivers/char/tpm/tpm.c:720: error: redefinition of 'tpm_pcr_read' include/linux/tpm.h:35: error:previous definition of 'tpm_pcr_read' was here drivers/char/tpm/tpm.c:752: error: redefinition of 'tpm_pcr_extend' include/linux/tpm.h:38: error:previous definition of 'tpm_pcr_extend' was here
--- include/linux/tpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/tpm.h +1 -1
@@ -27,7 +27,7 @@*/ #define TPM_ANY_NUM 0xFFFF -#if defined(CONFIG_TCG_TPM ) +#if defined(CONFIG_TCG_TPM ) || defined(CONFIG_TCG_TPM_MODULE )extern int tpm_pcr_read (u32 chip_num,int pcr_idx,u8 *res_buf);extern int tpm_pcr_extend (u32 chip_num,int pcr_idx,const u8 *hash);
PATCH 1/1 wireless: airo_cs needs WEXT_SPY
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
airo_cs uses spy interfaces so it needs to select WEXT_SPY.
ERROR: "iw_handler_set_thrspy" [drivers/net/wireless/airo.ko] undefined!
ERROR: "wireless_spy_update" [drivers/net/wireless/airo.ko] undefined!
ERROR: "iw_handler_get_spy" [drivers/net/wireless/airo.ko] undefined!
ERROR: "iw_handler_get_thrspy" [drivers/net/wireless/airo.ko] undefined!
ERROR: "iw_handler_set_spy" [drivers/net/wireless/airo.ko] undefined!
--- drivers/net/wireless/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/Kconfig +1 -0
@@ -111,6 +111,7 @@ config AIRO_CS tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" depends on PCMCIA && (BROKEN || !M32R) select WIRELESS_EXT + select WEXT_SPY select CRYPTO select CRYPTO_AES ---help---
PATCH 1/1 k8.h: add struct bootnode
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
k8.h uses struct bootnode but does not #include a header file for it, so provide a simple declaration for it.
arch/x86/include/asm/k8.h:13: warning: 'struct bootnode' declared inside parameter list arch/x86/include/asm/k8.h:13: warning: its scope is only this definition or declaration, which is probably not what you want
--- arch/x86/include/asm/k8.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/k8.h +1 -0
@@ -4,6 +4,7 @@#include <linux/pci.h> extern struct pci_device_id k8_nb_ids[]; +struct bootnode ;extern int early_is_k8_nb (u32 value);extern struct pci_dev **k8_northbridges;
Re: [PATCH -next] k8.h: add struct bootnode
Quoted 9 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
k8.huses struct bootnode but does not #include a header file for it, so provide a simple declaration for it.
arch/x86/include/asm/k8.h:13: warning: 'struct bootnode' declared inside parameter listarch/x86/include/asm/k8.h:13: warning: its scope is only this definition or declaration, which is probably not what you wantSigned-off-by Randy Dunlap <[email protected]>
This is probably my fault originating from my patchset in Ingo's x86/mm tree with some unexpected config option combination. Thanks Randy!
Quoted 14 lines
--- arch/x86/include/asm/k8.h | 1 + 1 file changed, 1 insertion(+)arch/x86/include/asm/k8.h +1
-0@@ -4,6 +4,7 @@#include <linux/pci.h> extern struct pci_device_id k8_nb_ids[]; +struct bootnode ;extern int early_is_k8_nb (u32 value);extern struct pci_dev **k8_northbridges;
[tip:x86/mm] x86: k8.h: Add struct bootnode
In reply to Randy DunlapCommit-ID: 0420101c075530c65ba00b6fe7291b126fbfc5d2 Gitweb: http://git.kernel.org/tip/0420101c075530c65ba00b6fe7291b126fbfc5d2 Author: Randy Dunlap <[email protected]> AuthorDate: Wed, 28 Oct 2009 16:09:55 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 8 Nov 2009 12:55:38 +0100
x86: k8.h: Add struct bootnode
k8.h uses struct bootnode but does not #include a header file for it, so provide a simple declaration for it.
arch/x86/include/asm/k8.h:13: warning: 'struct bootnode'
declared inside parameter list arch/x86/include/asm/k8.h:13:
warning: its scope is only this definition or declaration, which is probably not what you want
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/k8.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/x86/include/asm/k8.h +1 -0
@@ -4,6 +4,7 @@#include <linux/pci.h> extern struct pci_device_id k8_nb_ids[]; +struct bootnode ;extern int early_is_k8_nb (u32 value);extern struct pci_dev **k8_northbridges;