Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761307AbYFZPJI (ORCPT ); Thu, 26 Jun 2008 11:09:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754426AbYFZPIz (ORCPT ); Thu, 26 Jun 2008 11:08:55 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:37224 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549AbYFZPIx (ORCPT ); Thu, 26 Jun 2008 11:08:53 -0400 Date: Fri, 27 Jun 2008 01:08:42 +1000 From: Stephen Rothwell To: linux-next@vger.kernel.org Cc: LKML Subject: linux-next: Tree for June 26 Message-Id: <20080627010842.e1a0c4b5.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.5.0rc2 (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=_Fri__27_Jun_2008_01_08_42_+1000_KyI7fh.bKk56GRwH" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 11216 Lines: 279 --Signature=_Fri__27_Jun_2008_01_08_42_+1000_KyI7fh.bKk56GRwH Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since next-20080625: The tip-core tree lost its three conflicts against Linus' tree. The pci tree gained two conflicts against the x86 tree. The v4l-dvb tree had the second revert undone. We will see if this is right. The net tree gained a conflict against the wireless-current tree. The vfs tree lost its conflict against the sched tree. The arm tree lost its conflict against Linus' tree. The rr tree gained a patch for a build problem instead the revert. The firmware tree lost a conflict against the usb tree. I have also applied the following patches for know problems: fujitsu-laptop: depends on INPUT iwlwifi: fix build for CONFIG_INPUT=3Dn module: fix NULL pointer dereference in find_symbol() ---------------------------------------------------------------------------- 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 95 trees (counting Linus' and 13 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 Merging cpufreq-current/fixes Merging input-current/for-linus Merging quilt/driver-core Merging quilt/usb Merging tip-core/auto-core-next 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_rt.c Applying sched: fix rculist split fallout 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/process_32.c CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c Applying acpi-acpi_numa_init-build-fix Applying ia64, acpi: fix Altix boot breakage in ACPI Applying acpi: fix boot breakage on Altix Merging pci/linux-next CONFLICT (content): Merge conflict in arch/x86/kernel/setup_64.c 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 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 Applying v4l-dvb: class_for_each_device API change fallout Created commit 31abc35: Revert "V4L/DVB (8049): budget-ci: Add support for = Technotrend budget C-1501 dvb-c card" 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 Merging sh/master 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 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_throttling.c CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c Merging blackfin/for-linus Merging nfsd/nfsd-next CONFLICT (content): Merge conflict in net/sunrpc/auth_gss/auth_gss.c 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 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 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 drivers/net/wireless/iwlwifi/iwl4965-= base.c Applying wireless: fix fallout from device_create removal Merging sparc/master CONFLICT (content): Merge conflict in include/asm-m68k/sbus.h Merging galak/powerpc-next CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without= -of.txt 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/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 Applying rr fix patch 1 Applying virtio: virtio console can be a module 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 Merging trivial/next Merging ubifs/for_andrew Merging lsm/for-next Merging block/for-next CONFLICT (content): Merge conflict in arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c CONFLICT (delete/modify): arch/x86/kernel/i8259_64.c deleted in HEAD and mo= dified in block/for-next. Version block/for-next of arch/x86/kernel/i8259_6= 4.c left in tree. CONFLICT (content): Merge conflict in arch/x86/xen/smp.c CONFLICT (delete/modify): include/asm-x86/hw_irq_32.h deleted in HEAD and m= odified in block/for-next. Version block/for-next of include/asm-x86/hw_irq= _32.h left in tree. CONFLICT (delete/modify): include/asm-x86/hw_irq_64.h deleted in HEAD and m= odified in block/for-next. Version block/for-next of include/asm-x86/hw_irq= _64.h left in tree. CONFLICT (delete/modify): include/asm-x86/mach-default/irq_vectors.h delete= d in HEAD and modified in block/for-next. Version block/for-next of include= /asm-x86/mach-default/irq_vectors.h left in tree. CONFLICT (delete/modify): include/asm-x86/mach-voyager/irq_vectors.h delete= d in HEAD and modified in block/for-next. Version block/for-next of include= /asm-x86/mach-voyager/irq_vectors.h left in tree. CONFLICT (content): Merge conflict in kernel/Makefile Applying block: fix up rculist split fallout Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c CONFLICT (content): Merge conflict in drivers/net/Kconfig CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c 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 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 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 Applying fujitsu-laptop: depends on INPUT Applying iwlwifi: fix build for CONFIG_INPUT=3Dn Applying module: fix NULL pointer dereference in find_symbol() --Signature=_Fri__27_Jun_2008_01_08_42_+1000_KyI7fh.bKk56GRwH Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkhjsPoACgkQTgG2atn1QN/V+wCghs4JND9ptbFTVagwtBpyNMjG e/AAnRLWUrmZbfvoK2E8NJS8NVM1IASe =lEus -----END PGP SIGNATURE----- --Signature=_Fri__27_Jun_2008_01_08_42_+1000_KyI7fh.bKk56GRwH-- -- 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/