Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756552AbYGHJXQ (ORCPT ); Tue, 8 Jul 2008 05:23:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753541AbYGHJXA (ORCPT ); Tue, 8 Jul 2008 05:23:00 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:54548 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751900AbYGHJW6 (ORCPT ); Tue, 8 Jul 2008 05:22:58 -0400 Date: Tue, 8 Jul 2008 19:22:51 +1000 From: Stephen Rothwell To: linux-next@vger.kernel.org Cc: LKML Subject: linux-next: Tree for July 8 Message-Id: <20080708192251.3275d283.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Tue__8_Jul_2008_19_22_51_+1000_4_.D78jyve0s5uwb" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 14169 Lines: 350 --Signature=_Tue__8_Jul_2008_19_22_51_+1000_4_.D78jyve0s5uwb Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since next-20080704: Temporarily dropped tree: ttydev (since it would not import on top of any tree I have) The usb.current gained a white space conflict against Linus' tree (which I assume will be gone as soon as Greg rebases his tree). The usb tree gained a conflict against Linus' tree. The tip-core tree gained a conflict against Linus' tree. The sched tree lost a build fix patch. The x86 tree lost a conflict against Linus' tree but gained two against the ftrace tree. The pci tree gained a conflict against the driver-core tree and needed another build fix patch. The kbuild tree needed a commit reverted to fix the build. The acpi tree gained three m conflicts against the pci tree. The scsi tree gained 2 conflicts against the driver-core tree. the powerpc tree lost a conflict against the i2c tree. The net tree lost a conflict against Linus' tree but gained three more against the wireless-current, pci and x86 trees. The wireless tree lost its 2 conflicts. The trivial tree gained a conflict against Linus' tree. The firmware tree gained a conflict against Linus' tree. The battery tree gained 2 conflicts against the arm tree. The generic-ipi tree lost a conflict and a build fix patch. The mfd tree gained a conflict against Linus' tree. The hdlc tree gained 2 conflicts against the net tree. I have also applied the following patches for known problems (I assume that these will be merged into their appropriate trees shortly): fix "ftrace: store mcount address in rec->ip" linux-next: zero based percpu build error on s390 sparc64: sysdev API change fallout The patches are no longer applied: NFS: Fix the mount protocol defaults for binary mounts (applies, but breaks the build) ttydev: fix pamc_zilog for tty pointer move ttydev: sparc fix for tty move ttydev: sparc32 fix for tty move atmel_serial: Fix tty_port breakage (the ttydev tree is not included today) linux-next: generic helpers for arch IPI function calls build bug / s390 (no longer needed) I have also reverted 2 commits from the mmc tree because one of them broke the powerpc allyesconfig build. I also accidentally removed the merge log before committing it to the tree but the summary is still below. ---------------------------------------------------------------------------- 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, it is also built with powerpc allnoconfig, 44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. We are up to 104 trees (counting Linus' and 14 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 powerpc-merge/merge Merging scsi-rc-fixes/master Merging net-current/master Merging sparc-current/master Merging sound-current/for-linus Merging arm-current/master 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/core/hcd.c Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-2.6.26 Merging quilt/driver-core Merging quilt/usb CONFLICT (content): Merge conflict in drivers/usb/core/hub.c Merging tip-core/auto-core-next CONFLICT (content): Merge conflict in lib/vsprintf.c Merging cpus4096/auto-cpus4096-next Merging ftrace/auto-ftrace-next Merging genirq/auto-genirq-next Merging safe-poison-pointers/auto-safe-poison-pointers-next Merging sched/auto-sched-next CONFLICT (content): Merge conflict in kernel/Makefile CONFLICT (content): Merge conflict in kernel/sched.c CONFLICT (content): Merge conflict in kernel/sched_rt.c Merging stackprotector/auto-stackprotector-next Merging timers/auto-timers-next Merging x86/auto-x86-next CONFLICT (content): Merge conflict in arch/x86/kernel/entry_32.S CONFLICT (content): Merge conflict in arch/x86/kernel/entry_64.S CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c CONFLICT (content): Merge conflict in drivers/base/topology.c CONFLICT (content): Merge conflict in include/asm-x86/irqflags.h Merging pci/linux-next CONFLICT (content): Merge conflict in arch/sparc64/kernel/pci.c CONFLICT (delete/modify): arch/x86/kernel/setup_64.c deleted in HEAD and mo= dified in pci/linux-next. Version pci/linux-next of arch/x86/kernel/setup_6= 4.c left in tree. CONFLICT (content): Merge conflict in arch/x86/pci/irq.c CONFLICT (content): Merge conflict in arch/x86/pci/pci.h CONFLICT (content): Merge conflict in include/linux/device.h Applying pci: usb fixup 1 Applying pci: include linux/pm_wakeup.h for device_set_wakeup_capable Merging quilt/device-mapper Merging hid/mm Merging quilt/i2c CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c Merging quilt/kernel-doc Merging avr32/avr32-arch Merging v4l-dvb/stable CONFLICT (content): Merge conflict in drivers/media/video/Kconfig Applying v4l-dvb: class_for_each_device API change fallout Merging s390/features CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c CONFLICT (content): Merge conflict in drivers/s390/cio/qdio.c CONFLICT (content): Merge conflict in drivers/s390/net/claw.c CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c CONFLICT (content): Merge conflict in drivers/s390/net/netiucv.c Merging sh/master Merging jfs/next Merging kbuild/master Created commit 9aeede5: Revert "kconfig: normalize int/hex values" Merging quilt/ide Merging libata/NEXT Merging nfs/linux-next Merging xfs/master Merging infiniband/for-next Merging acpi/test CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in arch/ia64/kernel/process.c CONFLICT (content): Merge conflict in arch/x86/kernel/process.c CONFLICT (content): Merge conflict in arch/x86/kernel/srat_32.c CONFLICT (content): Merge conflict in drivers/acpi/processor_core.c CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c CONFLICT (content): Merge conflict in drivers/pci/pci.c CONFLICT (content): Merge conflict in drivers/pci/pci.h CONFLICT (content): Merge conflict in include/acpi/acpi_bus.h CONFLICT (content): Merge conflict in include/asm-ia64/processor.h CONFLICT (content): Merge conflict in include/asm-x86/processor.h Merging blackfin/for-linus Merging nfsd/nfsd-next CONFLICT (content): Merge conflict in net/sunrpc/svc.c Merging ieee1394/for-next Merging hwmon/testing Merging ubi/master Merging kvm/master Merging dlm/next Merging scsi/master CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_aux.c CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_def.h Applying scsi: fix fallout from the class_find_device API change Applying scsi: fix fallout from KOBJ_NAME_LEN removal 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 CONFLICT (content): Merge conflict in drivers/macintosh/mediabay.c Merging lblnet/master Merging ext4/next Merging 4xx/next Merging async_tx/next Merging udf/for_next Merging security-testing/next Merging net/master CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without= -of.txt CONFLICT (content): Merge conflict in arch/x86/configs/x86_64_defconfig CONFLICT (content): Merge conflict in drivers/net/fs_enet/fs_enet-main.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-3945= .c CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c Merging sparc/master Merging galak/powerpc-next Merging mtd/master Merging wireless/master Merging crypto/master Merging vfs/vfs-2.6.25 Merging sound/master Merging arm/devel CONFLICT (content): Merge conflict in arch/arm/kernel/time.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c Merging cpufreq/next CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c Merging v9fs/for-next Merging quilt/rr CONFLICT (content): Merge conflict in drivers/char/hvc_console.h CONFLICT (content): Merge conflict in kernel/stop_machine.c Merging cifs/master Merging mmc/next Merging gfs2/master Merging input/next Merging semaphore/semaphore Merging semaphore-removal/semaphore-removal CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c Merging bkl-removal/bkl-removal CONFLICT (content): Merge conflict in fs/nfs/file.c Merging trivial/next CONFLICT (content): Merge conflict in include/linux/securebits.h Merging ubifs/for_andrew Merging lsm/for-next Merging block/for-next Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in drivers/atm/Makefile CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmwa= re/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_34= 10.h left in tree. CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmwa= re/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_50= 52.h left in tree. CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c CONFLICT (content): Merge conflict in include/linux/firmware.h CONFLICT (content): Merge conflict in sound/pci/Kconfig CONFLICT (content): Merge conflict in sound/pci/maestro3.c CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c Merging pcmcia/master Merging battery/master CONFLICT (content): Merge conflict in drivers/power/Kconfig CONFLICT (content): Merge conflict in drivers/power/Makefile Merging leds/for-mm Merging backlight/for-mm CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile Merging kgdb/kgdb-next Merging slab/for-next Merging m68knommu/for-next Merging uclinux/for-next Merging md/for-next Merging cris/for-next Merging kmemcheck/auto-kmemcheck-next CONFLICT (content): Merge conflict in arch/x86/mm/Makefile CONFLICT (content): Merge conflict in include/asm-x86/pgtable.h CONFLICT (content): Merge conflict in kernel/sysctl.c Merging generic-ipi/auto-generic-ipi-next CONFLICT (content): Merge conflict in arch/powerpc/mm/slice.c CONFLICT (content): Merge conflict in arch/s390/kernel/time.c CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c CONFLICT (content): Merge conflict in init/main.c CONFLICT (content): Merge conflict in net/iucv/iucv.c CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c Applying generic-ipi: powerpc fallout fixes Merging mips/mips-for-linux-next Merging mfd/for-next CONFLICT (content): Merge conflict in MAINTAINERS Merging hdlc/hdlc-next CONFLICT (content): Merge conflict in drivers/net/wan/cosa.c CONFLICT (content): Merge conflict in drivers/net/wan/hdlc_fr.c CONFLICT (content): Merge conflict in drivers/net/wan/pc300_drv.c Applying linux-next: zero based percpu build error on s390 Created commit 67849ef: Revert "mmc: fix spares errors of sdhci.c" Created commit 57488a6: Revert "sdhci: graceful handling of bad addresses" Applying sparc64: sysdev API change fallout --Signature=_Tue__8_Jul_2008_19_22_51_+1000_4_.D78jyve0s5uwb Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkhzMesACgkQjjKRsyhoI8zMngCgvChWLXx+29xZH4kYXfPEZ4FB xxwAn1enjC+rLpzWs3/M7DXkAno+UuYP =/Xj9 -----END PGP SIGNATURE----- --Signature=_Tue__8_Jul_2008_19_22_51_+1000_4_.D78jyve0s5uwb-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/