linux-next: Tree for Oct 25

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: linux-next@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>,
	Linus <torvalds@linux-foundation.org>
Subject: linux-next: Tree for Oct 25
Date: Tue, 25 Oct 2011 20:36:28 +1100	[thread overview]
Message-ID: <20111025203628.40a1b8a475e32053aa34dabe@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 3454 bytes --]

Hi all,

*Note well*

This tree has nate had any build testing at all.  As such, it probably
doesn't build :-) This tree is really just a roll up of the current state
of the trees when the v3.2 merge window opened.  It will not be put into
the build system referred to below.

The linux-next tree remains available from
git://github.com/sfrothwell/linux-next.git .  But this will probably be
the laste one available there.

It is also back on git.kernel.org.  The patch is still absent, however.

This tree is certainly broken on sparc :-(

Changes since 20111014:

Dropped tree: ptrace (at the maintainers request)

The arm-soc tree gained conflicts against the arm tree.

The at91 tree lost its conflict.

The s5p tree lost its conflicts.

The libata tree gained a conflict against the at91 tree.

The scsi tree gained a conflict against the s390 tree.

The bluetooth tree lost several conflicts but gained another agains
Linus' tree.

The security tree probably lost its build failure.

The pm tree gained a conflict against the s390 tree.

The tip tree gained conflicts against the cputime tree.

The driver-core tree gained a conflict against the net-next tree.

The tty tree gained conflicts against Linus' tree.

The staging tree gained a conflict against the net-next tree.

The moduleh tree gained conflicts agains the xen-two and Linus' tree.

The akpm tree gained conflicts against the driver-core and block trees
and I dropped a few patches that had turned up elsewhere.

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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 (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 199 trees (counting Linus' and 27 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 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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]