Messages in this thread | | | Date | Tue, 22 Apr 2008 17:28:26 +1000 | From | Stephen Rothwell <> | Subject | linux-next: Tree for April 22 |
| |
Hi all,
I am not sure how useful these trees are during the merge window, but I shall persist for a while.
Changes since next-20080421:
The build bug in infiniband migrated into Linus' tree with Greg's merge. It is already fixed in Linus' tree.
One of the drivers merged into Linus' tree from the Arm tree won't build on x86_64 (at least).
Several conflicts have disappeared due to code being merged upstream and a few more trivial ones have appeared for the same readon.
Xfs has a bug (caused by the semaphore tree) in one of its debugging functions - already fixed upstream.
The firesat driver still fails to build and so is still reverted.
----------------------------------------------------------------------------
I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git (tar balls at http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).
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, it is also built with powerpc allnoconfig, 44x/ebony_defconfig and allyesconfig.
There were a few merge conflicts (fairly trivial and/or notified) and couple of build failures (notified). Below is a summary of the state of the merge.
We are up to 58 trees, 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.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
Merging origin/master Applying infiniband-fix-2 Created commit 8c6735c: Revert "[ARM] 4964/1: htc-pasic3: MFD driver for PASIC3 LED control + DS1WM chip" Merging x86-fixes/for-linus Merging sched-fixes/for-linus Merging powerpc-merge/merge Merging scsi-rc-fixes/master Merging net-current/master Merging quilt/driver-core CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/base/power/main.c CONFLICT (content): Merge conflict in include/linux/pm.h Merging quilt/pci CONFLICT (content): Merge conflict in drivers/pci/quirks.c Merging quilt/usb Merging x86/for-akpm Merging sched/for-akpm Merging quilt/device-mapper Merging hid/mm Merging quilt/i2c Merging quilt/kernel-doc CONFLICT (content): Merge conflict in Documentation/DocBook/kernel-locking.tmpl Merging avr32/avr32-arch Merging v4l-dvb/stable Merging s390/features Merging sh/master Merging jfs/next Merging kbuild/master Merging quilt/ide CONFLICT (content): Merge conflict in drivers/ide/ide-cd.c CONFLICT (content): Merge conflict in include/linux/Kbuild Merging libata/NEXT Merging nfs/linux-next Merging xfs/master Applying xfs-fix-1 Merging infiniband/for-next CONFLICT (content): Merge conflict in drivers/infiniband/hw/ipath/ipath_verbs.c Merging acpi/test CONFLICT (content): Merge conflict in arch/x86/kernel/apm_32.c Merging blackfin/for-linus Merging nfsd/nfsd-next Merging ieee1394/for-next Merging hwmon/testing Merging ubi/master Merging kvm/master CONFLICT (content): Merge conflict in include/asm-powerpc/mmu-44x.h Applying kvm-fix-1 Merging dlm/next Merging scsi/master Merging ia64/test Merging tests/master CONFLICT (content): Merge conflict in lib/Kconfig.debug Merging ocfs2/linux-next Merging selinux/for-akpm Merging quilt/m68k Merging powerpc/powerpc-next Merging hrt/mm Merging lblnet/master Merging ext4/next CONFLICT (content): Merge conflict in fs/jbd2/journal.c CONFLICT (content): Merge conflict in fs/jbd2/revoke.c Merging 4xx/next Merging async_tx/next Merging udf/for_next Merging security-testing/next Merging net/master Merging galak/powerpc-next Merging mtd/master Merging wireless/master Merging crypto/master Merging vfs/vfs-2.6.25 CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging semaphore/semaphore Merging x86-latest/latest CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c CONFLICT (content): Merge conflict in arch/x86/pci/common.c CONFLICT (content): Merge conflict in arch/x86/pci/pci.h CONFLICT (content): Merge conflict in include/asm-powerpc/bitops.h Applying x86-latest-kvm-fix-1 Merging sched-latest/latest CONFLICT (content): Merge conflict in kernel/kthread.c Merging quilt/ldp CONFLICT (content): Merge conflict in drivers/misc/Kconfig Created commit 0c8340a: Revert "DVB: add firesat driver" Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP
[unhandled content-type:application/pgp-signature] | |