From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Subject: Re: linux-next: Tree for July 26 Date: Mon, 26 Jul 2010 10:53:20 +0200 Message-ID: <4C4D4D00.30304@petalogix.com> References: <20100726154809.7f42c137.sfr@canb.auug.org.au> Reply-To: michal.simek@petalogix.com Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:51610 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753323Ab0GZI4r (ORCPT ); Mon, 26 Jul 2010 04:56:47 -0400 In-Reply-To: <20100726154809.7f42c137.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML Stephen Rothwell wrote: > Hi all, > > Changes since 20100723: > > Undropped tree: xen > > The arm tree gained a conflict against the arm-current tree. > > The xfs tree gained a build failure so I used the version from > next-20100723. > > The kvm tree gained a build failure for which I applied a patch. > > The wireless tree lost its conflict. > > The device-mapper tree lost a conflict. > > The kgdb tree lost its conflict. > > The xen tree lost its build problems but gained a couple more for which I > reverted a commit and a subtreee. > > The tip tree gained a conflict against Linus' 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/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 167 trees (counting Linus' and 22 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. > Merging microblaze/next CONFLICT (content): Merge conflict in arch/microblaze/mm/init.c Fixed. Thanks, Michal -- Michal Simek, Ing. (M.Eng) PetaLogix - Linux Solutions for a Reconfigurable World w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663