Message-Id: <20080729172337.b3d74100.sfr@canb.auug.org.au>
Date:	Tue, 29 Jul 2008 17:23:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	linux-next@...r.kernel.org
Cc:	LKML <linux-kernel@...r.kernel.org>
Subject: linux-next: Tree for July 29

Hi all,

Changes since next-20080728:

Temporarily dropped trees: acpi (it is being moved to a new tree and is
just accumulating conflicts against Linus' tree).
	v4l-dvb (got lots of conflicts against the version that was
merged to Linus).

Changed trees: the tests tree changed directory
	the sound tree changed branch

Linus' tree lost the three build fixes.

The pci-current tree gained a build fix patch.

The v4l-dvb tree gained 51 conflicts against Linus' tree and was dropped.

The tests tree lost its conflict.

The rr tree lost its conflicts.

The firmware tree gained a conflict against Linus' tree.

The kmemcheck tree lost its conflicts.

I have also applied the following patches for known problems:

	hfcmulti is not supported on big endian
	sparc: add iommu_num_pages helper function fix
	cpumask: statement expressions confuse some versions of gcc

The sparc(32) defconfig build still fails.

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

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

-- 
Cheers,
Stephen Rothwell                    sfr@...b.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
Applying powerpc: generic iommu helper fallout
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
CONFLICT (content): Merge conflict in drivers/dca/dca-sysfs.c
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ftrace/auto-ftrace-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 x86/auto-x86-next
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
CONFLICT (content): Merge conflict in Documentation/video4linux/CARDLIST.em28xx
CONFLICT (add/add): Merge conflict in Documentation/video4linux/gspca.txt
CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/Kconfig
CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/Makefile
CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-usb/anysee.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smscoreapi.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/siano/smsdvb.c
CONFLICT (content): Merge conflict in drivers/media/radio/radio-si470x.c
CONFLICT (content): Merge conflict in drivers/media/video/bt8xx/bttv-driver.c
CONFLICT (content): Merge conflict in drivers/media/video/cx18/cx18-firmware.c
CONFLICT (content): Merge conflict in drivers/media/video/cx18/cx18-ioctl.c
CONFLICT (content): Merge conflict in drivers/media/video/cx18/cx18-streams.c
CONFLICT (content): Merge conflict in drivers/media/video/cx23885/cx23885-417.c
CONFLICT (content): Merge conflict in drivers/media/video/cx23885/cx23885-cards.c
CONFLICT (content): Merge conflict in drivers/media/video/cx25840/cx25840-core.c
CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-cards.c
CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-dvb.c
CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx.h
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/conex.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/etoms.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/gspca.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/mars.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/ov519.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/pac207.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/pac7311.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/sonixb.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/sonixj.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/spca500.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/spca501.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/spca505.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/spca506.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/spca508.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/spca561.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/stk014.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/sunplus.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/t613.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/tv8532.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/vc032x.c
CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/zc3xx.c
CONFLICT (content): Merge conflict in drivers/media/video/ivtv/ivtv-ioctl.c
CONFLICT (add/add): Merge conflict in drivers/media/video/s2255drv.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-cards.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-empress.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-video.c
CONFLICT (add/add): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
CONFLICT (content): Merge conflict in drivers/media/video/soc_camera.c
CONFLICT (add/add): Merge conflict in drivers/media/video/videobuf-dma-contig.c
CONFLICT (content): Merge conflict in drivers/media/video/videodev.c
CONFLICT (content): Merge conflict in drivers/media/video/zoran_card.c
CONFLICT (content): Merge conflict in include/linux/videodev2.h
CONFLICT (content): Merge conflict in include/media/v4l2-dev.h
$ git reset --hard
Merging s390/features
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 blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
Merging ocfs2/linux-next
Merging quilt/m68k
Merging powerpc/next
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging sparc/master
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging arm/devel
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
Merging bkl-removal/bkl-removal
Merging trivial/next
CONFLICT (content): Merge conflict in Documentation/edac.txt
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
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
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
Merging generic-ipi/auto-generic-ipi-next
Merging mips/mips-for-linux-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (add/add): Merge conflict in drivers/gpu/Makefile
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i830/Makefile
CONFLICT (content): Merge conflict in include/Kbuild
CONFLICT (add/add): Merge conflict in include/drm/Kbuild
Merging voltage/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Applying hfcmulti is not supported on big endian
Applying sparc: add iommu_num_pages helper function fix
Applying cpumask: statement expressions confuse some versions of gcc

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists