linux-next: Tree for Jun 17

* linux-next: Tree for Jun 17
@ 2013-06-17  8:51 ` Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2013-06-17  8:51 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

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

Hi all,

Changes since 20130607:

New trees: arm-mpidr and arm64-hugepages

The arm64 tree gained a conflict against Linus' tree.

The pci tree gained a conflict against Linus' tree.

The net-next tree gained conflicts against Linus' tree.

The drm tree gained a conflict against Linus' tree.

The drm-intel tree gained conflicts against Linus' tree.

The sound-asoc tree gained a build failure, so I used the version from
next-20130607.

The fbdev tree gained a conflict against the drm tree.

The leds tree gained a build failure, so I used the version from
next-20130607.

The driver-core tree gained a conflict against the devicetree tree.

The pinctrl tree gained a conflict against Linus' tree.

The arm-soc tree gained conflicts against the net-next and tty trees.

The msm tree lost its build failure but gained a conflict against the
arm-soc tree.

The renesas tree gained conflicts against the sh and tty trees.

The clk tree gained a conflict against the arm-soc tree.

The arm64-hugepages tree gained conflicts against the arm64 tree.

The akpm tree still had its build failure for which I disabled some
staging tree code.  It also some patches that turned up elsewhere and
gained a conflict against the kvm tree.

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

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/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,
sparc64 and arm 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 229 trees (counting Linus' and 31 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.  And to Paul
Gortmaker for triage and bug fixes.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Stephen Rothwell <sfr@canb.auug.org.au>

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

^ permalink raw reply	[flat|nested] 19+ messages in thread