linux-next: Tree for August 16

linux-next: Tree for August 16

[Stephen Rothwell]

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

Hi all,

As the merge window has closed, let the flood commence. :-)

Changes since 20100813:

New tree; florian-viafb

My fixes tree contains:
	spi: update for of_device to platform_device replacement

The sh tree gained a conflict against Linus' tree.

The ocfs2 tree lost its conflict.

The v4l-dvb tree lost its conflicts.

The acpi tree lost its build failure.

The rr tree lost its conflicts.

The alacrity tree gained a conflict against Linus' tree.

The spi 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 170 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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: Tree for August 16 (ceph)

[Randy Dunlap]

On Mon, 16 Aug 2010 15:04:20 +1000 Stephen Rothwell wrote:

> Hi all,
> 
> As the merge window has closed, let the flood commence. :-)
> 
> Changes since 20100813:


linux-next-20100816/net/ceph/debugfs.c:255: error: conflicting types for 'ceph_debugfs_client_init'
linux-next-20100816/include/linux/ceph/debugfs.h:29: note: previous declaration of 'ceph_debugfs_client_init' was here



---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for August 16 (ceph)

[Randy Dunlap]

On Mon, 16 Aug 2010 10:08:08 -0700 Randy Dunlap wrote:

> On Mon, 16 Aug 2010 15:04:20 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > As the merge window has closed, let the flood commence. :-)
> > 
> > Changes since 20100813:
> 
> 
> linux-next-20100816/net/ceph/debugfs.c:255: error: conflicting types for 'ceph_debugfs_client_init'
> linux-next-20100816/include/linux/ceph/debugfs.h:29: note: previous declaration of 'ceph_debugfs_client_init' was here


Same error still present in linux-next 20100820.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for August 16 (ceph)

[Sage Weil]

On Fri, 20 Aug 2010, Randy Dunlap wrote:
> On Mon, 16 Aug 2010 10:08:08 -0700 Randy Dunlap wrote:
> 
> > On Mon, 16 Aug 2010 15:04:20 +1000 Stephen Rothwell wrote:
> > 
> > > Hi all,
> > > 
> > > As the merge window has closed, let the flood commence. :-)
> > > 
> > > Changes since 20100813:
> > 
> > 
> > linux-next-20100816/net/ceph/debugfs.c:255: error: conflicting types for 'ceph_debugfs_client_init'
> > linux-next-20100816/include/linux/ceph/debugfs.h:29: note: previous declaration of 'ceph_debugfs_client_init' was here
> 
> 
> Same error still present in linux-next 20100820.

Sorry, I hadn't updated my for-next branch.  It's pushed to kernel.org 
now.

Thanks-
sage