[lkml]   [2009]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: Tree for December 4
Stephen Rothwell wrote:
> Hi all,
> My usual call for calm: please do not put stuff destined for 2.6.34 into
> linux-next trees until after 2.6.33-rc1.
> Changes since 20091203:
> The ext3 tree lost its build failure.
> The nfs tree gained a build failure so I used the version from
> next-20091203.
> The block tree gained a build failure so I used the version from
> next-20091203.
> The pcmcia tree gained a conflict against the net tree.
> The irda tree gained a conflict against the net tree.
> The limits tree gained conflicts against the net and fsnotify trees.
> The tip tree gained a conflict against the limits tree.
> The sysctl tree gained 2 conflicts against the net tree.
> ----------------------------------------------------------------------------
> I have created today's linux-next tree at
> git://
> (patches at ). 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_DEBUG_INFO disabled when necessary.
> Below is a summary of the state of the merge.
> We are up to 155 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
> . 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 , the guys at and Randy
> Dunlap for doing many randconfig builds.
> There is a wiki covering stuff to do with linux-next at
> . Thanks to Frank Seidel.

> Merging microblaze/next
> CONFLICT (content): Merge conflict in drivers/serial/of_serial.c

I removed that my first patch from my next branch - it is in tty tree.


Michal Simek, Ing. (M.Eng)
PetaLogix - Linux Solutions for a Reconfigurable World
w: p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663

 \ /
  Last update: 2009-12-04 10:47    [W:0.080 / U:5.444 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site