From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for April 7 Date: Tue, 7 Apr 2009 14:07:17 +1000 Message-ID: <20090407140717.a7f0b07c.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Tue__7_Apr_2009_14_07_17_+1000_.Tc/PoXcxwx9ZrBM" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:44109 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750836AbZDGEH3 (ORCPT ); Tue, 7 Apr 2009 00:07:29 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: linux-next@vger.kernel.org Cc: LKML --Signature=_Tue__7_Apr_2009_14_07_17_+1000_.Tc/PoXcxwx9ZrBM Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20090406: Various conflicts have moved due to trees being merged into Linus' tree. The sound-current tree gained a build failure so I reverted a commit. The x86 tree lost its conflict. The tip-core tree lost its 3 conflicts. The tracing tree lost its 3 conflicts. The v4l-dvb tree gained a build failure so I used the version from next-20090406. The nfsd tree lost its conflict. The nfs tree lost its build failures. The scsi tree lost if conflict. The mtd tree lost its conflict. The firmware tree lost 2 conflicts. The driver-core tree lost its conflicts. The usb tree lost its conflict. The staging tree lost its conflicts. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://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 132 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master 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 CONFLICT (content): Merge conflict in firmware/WHENCE 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 CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.h 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 Merging s390/features Merging sh/master Merging sparc/master Merging x86/auto-x86-next Merging xtensa/master Merging tip-core/auto-core-next Merging cpus4096/auto-cpus4096-next Merging tracing/auto-tracing-next Merging genirq/auto-genirq-next 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 pci/linux-next Merging quilt/device-mapper Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Merging v4l-dvb/master $ git reset --hard HEAD^ Merging refs/next/20090406/v4l-dvb CONFLICT (content): Merge conflict in arch/sh/boards/board-ap325rxa.c CONFLICT (content): Merge conflict in arch/sh/boards/mach-migor/setup.c CONFLICT (content): Merge conflict in drivers/media/video/cx25840/cx25840-a= udio.c CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-aud= io.c CONFLICT (content): Merge conflict in include/linux/i2c-id.h Merging quota/for_next CONFLICT (content): merge conflict in fs/quota/dquot.c CONFLICT (content): Merge conflict in fs/Kconfig CONFLICT (content): Merge conflict in fs/ext4/ext4.h CONFLICT (content): Merge conflict in fs/ext4/inode.c CONFLICT (content): Merge conflict in fs/reiserfs/namei.c CONFLICT (content): Merge conflict in fs/reiserfs/stree.c CONFLICT (content): Merge conflict in fs/udf/balloc.c Merging jfs/next Merging kbuild/master Merging quilt/ide Merging libata/NEXT Merging nfs/linux-next Merging xfs/master Merging infiniband/for-next Merging acpi/test Merging nfsd/nfsd-next Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master Merging dlm/next Merging scsi/master Merging ocfs2/linux-next CONFLICT (content): Merge conflict in fs/ocfs2/dir.c Merging ext4/next Merging async_tx/next Merging udf/for_next Merging net/master Merging wireless/master Merging mtd/master Merging crypto/master Merging vfs/for-next Merging sound/for-next Merging cpufreq/next Merging v9fs/for-next CONFLICT (content): Merge conflict in net/9p/protocol.c Merging quilt/rr CONFLICT (content): Merge conflict in kernel/extable.c CONFLICT (content): Merge conflict in kernel/module.c CONFLICT (content): Merge conflict in kernel/params.c Merging cifs/master Merging mmc/next Merging gfs2/master Merging input/next Merging bkl-removal/bkl-removal Merging ubifs/linux-next Merging lsm/for-next Merging block/for-next Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in firmware/WHENCE 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 quilt/ttydev CONFLICT (content): Merge conflict in drivers/serial/8250_pci.c CONFLICT (content): Merge conflict in fs/devpts/inode.c Merging agp/agp-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 Merging cputime/cputime Merging osd/linux-next Merging fatfs/master Merging fuse/for-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging squashfs/master Merging omap/for-next Merging quilt/aoe Merging kmemleak/kmemleak CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in init/main.c CONFLICT (content): Merge conflict in lib/Kconfig.debug CONFLICT (content): Merge conflict in mm/slob.c Merging suspend/linux-next Merging quilt/driver-core Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master [master 4412b4e] Revert "ASoC: TWL4030: Add constrains for second stream" --Signature=_Tue__7_Apr_2009_14_07_17_+1000_.Tc/PoXcxwx9ZrBM Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkna0XUACgkQjjKRsyhoI8wjKgCdGzQwOB7CvMgSSIMSjN0ny12R MIAAoIDlTND6QCodQ9MtSgvg+13C5e+8 =I2E3 -----END PGP SIGNATURE----- --Signature=_Tue__7_Apr_2009_14_07_17_+1000_.Tc/PoXcxwx9ZrBM--