Subject: linux-next: Tree for June 10

From: Stephen Rothwell <[email-masked]>
Date: Tue, 10 Jun 2008 20:09:59 +1000

Hi all,

News:
	If a merge causes a build failure, I am now combining the fix
back into the merge so that we have less bad bisection points to hit.
The patches are still noted with an "Applying ..." note in the merge log
and summary.

	The diff summary (from Linus' tree) looks like:

 3701 files changed, 214575 insertions(+), 240756 deletions(-)

mainly due to the powerpc tree which removes about 140000 lines in
arch/ppc and include/asm-ppc.

Changes since next-20080606:

New trees: battery, tip-core, cpus4096, genirq, timers, leds, backlight
Changed trees: ftrace, safe-poison-pointers, sched, stackprotector,
	x86 (the repository changed)
Removed trees: hrt (replaced by timers tree), rcu, locking

The kbuild-current (which should actually be the kbuild tree - my
mistake) needed a commit reverted to fix the build.

The driver-core tree lost all three conflicts.

The usb tree needed the patch that was previously applied to the hid tree
for BLK pushdown fallout.

The tip-core tree got a trivial conflict with the kbuild-current tree.

The sched tree got a trivial conflict with ftrace tree and needed the
ftrace rculist split fixup patch.

The pci tree gained a conflict with the kbuild-current tree.

The hid tree gained a conflict with the driver-core tree since they share
(a slightly white space different) patch.

The powerpc tree gained several conflicts with the driver-core tree as it
removed some files the a driver-core patch was changing.  It also needed
a commit reverted that has turned out to need more thought.

The net tree gained a conflict with the net-current tree.

The wireless tree gained a conflict with the wireless-current tree.

The arm tree gained a conflict with the mtd tree.

The firmware tree fixed its build error but gained a new conflict against
the driver-core tree.

The backlight tree gained a couple of trivial conflicts with the arm tree.

I have applied the following temporary patch for known build problems:

	"Fix various 8390 builds" - the net tree broke builds on various
architectures - hopefully this patch will go into the net tree shortly.

----------------------------------------------------------------------------

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 92 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.

-- 
Cheers,
Stephen Rothwell                    [email-masked]

$ 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
Created commit 65e70c5: Revert "kbuild: simplify vmlinux link stage"
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
Applying usb: fix hiddev BLK pushdown fallout
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
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
Applying ftrace: fix rculist split fallout
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/base/power/main.c
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
CONFLICT (content): Merge conflict in include/linux/device.h
Merging quilt/device-mapper
Merging hid/mm
CONFLICT (content): Merge conflict in drivers/hid/usbhid/hiddev.c
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
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/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
Merging blackfin/for-linus
Merging nfsd/nfsd-next
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
CONFLICT (delete/modify): arch/ppc/platforms/cpci690.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/cpci690.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/ev64260.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/ev64260.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/ev64360.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/ev64360.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/hdpu.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/hdpu.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/katana.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/katana.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/radstone_ppc7d.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/radstone_ppc7d.c left in tree.
CONFLICT (delete/modify): arch/ppc/syslib/ppc_sys.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/syslib/ppc_sys.c left in tree.
Created commit 4a52dfc: Revert "powerpc: Free a PTE bit on ppc64 with 64K pages"
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/tg3.c
Merging sparc/master
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/main.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2x00dev.c
CONFLICT (content): Merge conflict in net/mac80211/ieee80211_i.h
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
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
CONFLICT (content): Merge conflict in drivers/mmc/host/mmc_spi.c
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 quilt/ldp.next
Applying ldp: fix fallout from v4l struct element renaming
Merging bkl-removal/bkl-removal
Merging trivial/next
Merging ubifs/for_andrew
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c
CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.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
Applying Fix various 8390 builds