linux-next: Tree for March 8
Subsystems (2)
Hi all,
Changes since 20100305:
Dropped tree: tmio-mmc (long unresolved conflicts and unable to fetch)
My fixes tree contains:
a patch for a pktcdvd build error from Arnd Bergmann
We are seeing conflicts migrate from being between 2 trees in linux-next to be between a tree and Linus' tree as things start to get merged.
Linus' tree gained a build failure for which I reverted a commit.
The xfs tree lost its merge fixup.
The vfs tree lost its merge fixup.
The bjdooks-i2c tree lost its conflicts.
The v4l-dvb tree lost a conflict.
The kvm tree lost its conflict.
The mtd tree still has its 2 build failures for which I applied patches.
The slab tree lost is merge fixup.
The mfd tree lost its conflict.
The trivial tree gained a conflict against Linus' 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 159 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 · 243 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 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 cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next CONFLICT (content): Merge conflict in arch/microblaze/include/asm/prom.h Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/alchemy/common/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/common/setup.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1200/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/board_setup.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1100/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/pb1200/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1500/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1550/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.h CONFLICT (add/add): Merge conflict in arch/mips/alchemy/xxs1500/platform.c CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/octeon-irq.c CONFLICT (content): Merge conflict in arch/mips/configs/db1200_defconfig CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-au1x00/au1000.h CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile CONFLICT (content): Merge conflict in drivers/pcmcia/au1000_generic.h CONFLICT (add/add): Merge conflict in drivers/pcmcia/db1xxx_ss.c CONFLICT (add/add): Merge conflict in drivers/pcmcia/xxs1500_ss.c CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.c left in tree. CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.h left in tree. $ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h 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 CONFLICT (content): Merge conflict in fs/gfs2/super.c CONFLICT (content): Merge conflict in fs/nfs/inode.c CONFLICT (content): Merge conflict in fs/ufs/inode.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c 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 Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c CONFLICT (content): Merge conflict in security/tomoyo/realpath.c 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 CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-usb/az6027.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/ngene/ngene-core.c CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-dvb.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-dvb.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-main.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-radio.c CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-video.c CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile 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 drivers/acpi/processor_core.c Applying: cpufreq: merge fixup for processor_core.c rename 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 CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c Applying: mtd: nand: fix name space clash Applying: mtd: declare inline functions static Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/char/hvc_console.c CONFLICT (content): Merge conflict in drivers/char/hvc_console.h CONFLICT (content): Merge conflict in drivers/char/virtio_console.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 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 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 Documentation/filesystems/proc.txt CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/debug-macro.S CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_ethtool.c CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_main.c CONFLICT (content): Merge conflict in drivers/net/typhoon.c Merging audit/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c CONFLICT (content): Merge conflict in include/linux/fsnotify.h CONFLICT (content): Merge conflict in kernel/audit_tree.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 MAINTAINERS 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/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 Merging omap_dss2/for-next Merging als/for-next Merging tip/auto-latest 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 quilt/driver-core Applying: i2c: update for semaphore to mutex conversion of devices Applying: ar9170: fix for driver-core ABI change Merging quilt/tty Merging quilt/usb Merging quilt/staging CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_660x.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/pcmad.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/poc.c CONFLICT (content): Merge conflict in drivers/staging/dream/camera/msm_camera.c CONFLICT (content): Merge conflict in drivers/staging/dream/camera/s5k3e2fx.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/hfa384x_usb.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211conv.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211metadef.h CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/prism2fw.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/prism2mib.c Merging scsi-post-merge/master [master 492fe5d] Revert "i2c: Add support for Xilinx XPS IIC Bus Interface"
Re: linux-next: Tree for March 8 (mtd)
Quoted 6 lines · Stephen Rothwell
Hi all,
Changes since 20100305:
The mtd tree still has its 2 build failures for which I applied patches.
drivers/mtd/sm_ftl.c:
sm_ftl.c:(.text+0x9c110): undefined reference to __nand_calculate_ecc' sm_ftl.c:(.text+0x9c123): undefined reference to __nand_correct_data' sm_ftl.c:(.text+0x9c14a): undefined reference to __nand_calculate_ecc' sm_ftl.c:(.text+0x9c15d): undefined reference to __nand_correct_data' sm_ftl.c:(.text+0x9c9ac): undefined reference to __nand_calculate_ecc' sm_ftl.c:(.text+0x9c9bf): undefined reference to __nand_calculate_ecc'
CONFIG_SM_FTL=yCONFIG_SM_FTL_MUSEUM=y
CONFIG_MTD_NAND=mCONFIG_MTD_NAND_VERIFY_WRITE=yCONFIG_MTD_NAND_ECC_SMC=y
but drivers/mtd/nand/Makefile does this:
obj-$(CONFIG_MTD_NAND) += nand.o nand_ecc.o
so having CONFIG_MTD_NAND_ECC_SMC different from CONFIG_MTD_NAND does not work.
Also:
config SM_FTL
tristate "SmartMedia/xD new translation layer" depends on EXPERIMENTAL && BLOCK
select MTD_BLKDEVS
help
This enables new and very EXPERMENTAL support for SmartMedia/xD
EXPERIMENTAL
FTL (Flash tanslation layer)
end with .
Write support isn't yet well tested, therefore this code IS likely to eat your card, so please don't use it together with valuable data. Use readonly driver (CONFIG_SSFDC) instead.
config SM_FTL_MUSEUM
boolean "Additional Support for 1MiB and 2MiB SmartMedia cards" depends on SM_FTL && MTD_NAND
select MTD_NAND_ECC_SMC
help
Very old SmartMedia cards need ECC to be calculated in the FTL
end with .
Such cards are very rare, thus enabling this option is mostly useless
end with .
Also this support is completely UNTESTED.
Signature · 1 line
~Randy
Re: linux-next: Tree for March 8 (mtd)
Quoted 9 lines · Randy Dunlap
Quoted 6 lines · Stephen Rothwell
Hi all,
Changes since 20100305:
The mtd tree still has its 2 build failures for which I applied patches.
Quoted 7 lines
drivers/mtd/sm_ftl.c:
sm_ftl.c:(.text+0x9c110): undefined reference to__nand_calculate_ecc' sm_ftl.c:(.text+0x9c123): undefined reference to__nand_correct_data' sm_ftl.c:(.text+0x9c14a): undefined reference to__nand_calculate_ecc' sm_ftl.c:(.text+0x9c15d): undefined reference to__nand_correct_data' sm_ftl.c:(.text+0x9c9ac): undefined reference to__nand_calculate_ecc' sm_ftl.c:(.text+0x9c9bf): undefined reference to__nand_calculate_ecc'
Thanks.
http://git.infradead.org/mtd-2.6.git/commitdiff/7de6f798
Signature · 2 lines
David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Re: linux-next: Tree for March 8 (mtd)
Quoted 18 lines · David Woodhouse
Quoted 9 lines · Randy Dunlap
Quoted 6 lines · Stephen Rothwell
Hi all,
Changes since 20100305:
The mtd tree still has its 2 build failures for which I applied patches.
Quoted 7 lines
drivers/mtd/sm_ftl.c:
sm_ftl.c:(.text+0x9c110): undefined reference to__nand_calculate_ecc' sm_ftl.c:(.text+0x9c123): undefined reference to__nand_correct_data' sm_ftl.c:(.text+0x9c14a): undefined reference to__nand_calculate_ecc' sm_ftl.c:(.text+0x9c15d): undefined reference to__nand_correct_data' sm_ftl.c:(.text+0x9c9ac): undefined reference to__nand_calculate_ecc' sm_ftl.c:(.text+0x9c9bf): undefined reference to__nand_calculate_ecc'
Quoted 4 lines
Thanks.
Ack. Thanks.
Signature · 1 line
~Randy
PATCH 1/1 sound: fix opti92x-ad1848 build
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix 'else' placement in ifdef block so that build succeeds:
sound/isa/opti9xx/opti92x-ad1848.c:221: error: 'else' without a previous 'if'
--- sound/isa/opti9xx/opti92x-ad1848.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/isa/opti9xx/opti92x-ad1848.c +2 -1
@@ -217,8 +217,9 @@ static int __devinit snd_opti9xx_init(stif (isapnp && chip->mc_base)/* PnP resource gives the least 10 bits */ chip->mc_base |=0xc00 ; + else#endif /* CONFIG_PNP */ - else { + { chip->mc_base =0xf8c ; chip->mc_base_size = opti9xx_mc_size[hardware]; }
Takashi Iwai
AppliedRe: [PATCH -next] sound: fix opti92x-ad1848 build
At Mon, 08 Mar 2010 09:32:42 -0800,
Quoted 10 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix 'else' placement in ifdef block so that build succeeds:
sound/isa/opti9xx/opti92x-ad1848.c:221: error: 'else' without a previous 'if'Signed-off-by Randy Dunlap <[email protected]>Cc Jaroslav Kysela <[email protected]>Cc Takashi Iwai <[email protected]>
Applied. Thanks!
Takashi
Quoted 18 lines
--- sound/isa/opti9xx/opti92x-ad1848.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)sound/isa/opti9xx/opti92x-ad1848.c +2
-1@@ -217,8 +217,9 @@ static int __devinit snd_opti9xx_init(stif (isapnp && chip->mc_base)/* PnP resource gives the least 10 bits */ chip->mc_base |=0xc00 ; + else#endif /* CONFIG_PNP */ - else { + { chip->mc_base =0xf8c ; chip->mc_base_size = opti9xx_mc_size[hardware]; }