linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for October 25
@ 2010-10-25  3:58 Stephen Rothwell
  2010-10-25  3:59 ` Stephen Rothwell
                   ` (7 more replies)
  0 siblings, 8 replies; 14+ messages in thread
From: Stephen Rothwell @ 2010-10-25  3:58 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Reminder: do not add 2.6.38 destined stuff to linux-next until after
2.6.37-rc1 is released.

Changes since 20101022:

The net-current tree gained a build failure for which I applied a patch.

The tegra tree lost its conflicts.

The powerpc tree lost its conflict.

The kvm tree lost its conflict.

The net tree lost its conflicts.

The crypto tree lost its conflict.

The block tree lost its conflict.

The mmc tree gained a build failure so I used the version from 20101022.

The slab tree lost its conflict.

The trivial lost its conflict.

The i7core_edac lost its conflict.

The tip tree lost its conflicts.

The xen tree lost its complex conflict against the tip tree, but gained a
build failure, so I used the version from next-20101021.

The percpu tree lost its conflicts.

The workqueue tree lost its conflict.

The bkl-trivial tree lost its conflicts.

The bkl-llseek tree lost its conflicts.

The bkl-vfs tree lost its conflicts.

The bkl-config tree lost its conflict.

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

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 177 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 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: 490 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-10-26 16:09 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-25  3:58 linux-next: Tree for October 25 Stephen Rothwell
2010-10-25  3:59 ` Stephen Rothwell
2010-10-25 23:25 ` [PATCH -next] pch_can: depends on PCI Randy Dunlap
2010-10-25 23:47   ` David Miller
2010-10-25 23:33 ` linux-next: Tree for October 25 (coda) Randy Dunlap
2010-10-25 23:52   ` Stephen Rothwell
2010-10-25 23:51 ` linux-next: Tree for October 25 (acpi/apei-related) Randy Dunlap
2010-10-25 23:54 ` linux-next: Tree for October 25 (netfilter/xt_socket) Randy Dunlap
2010-10-26  5:02   ` David Miller
2010-10-25 23:55 ` linux-next: Tree for October 25 (netfilter/nf_conntrack_reasm) Randy Dunlap
2010-10-26  5:03   ` David Miller
2010-10-26 16:09     ` David Miller
2010-10-25 23:57 ` linux-next: Tree for October 25 (acpi_video) Randy Dunlap
2010-10-25 23:59 ` linux-next: Tree for October 25 (nouveau_pm) Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).