linux-next: Tree for April 29

Previous thread: [Q]Can a file be dual licensed in upstream kernel? by pradeep singh rautela on Tuesday, April 29, 2008 - 1:37 am. (12 messages)

Next thread: [git patches] libata updates by Jeff Garzik on Tuesday, April 29, 2008 - 2:25 am. (1 message)
To: <linux-next@...>
Cc: LKML <linux-kernel@...>
Date: Tuesday, April 29, 2008 - 1:47 am

i all,

Changes since next-20080428a:

New trees: sparc, sound and arm (all have a "current" and "next" part).

Conflicts continue to disappear due to code being merged upstream. Also
several minor/whitespace conflicts have turned up due to merging slightly
different versions of patches than what is in the linux-next tree.

The nfsd tree merge produced a build problem yesterday which I ignored as
I hoped it would just go away quickly: the merge produces two versions
of ipv6_addr_set_v4mapped in include/net/ipv6.h so I have created a patch
to remove one. This should go away when nfsd is merged upstream ...

The sched-latest tree needs a fixup for some section mismatch errors it
produced on powerpc.

The appleir driver now builds ok, but novfs and the go7007 driver have
build problems and have been reverted.

I am still carrying the PNP fixup patches.
----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(tar balls at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).

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, it is also built with powerpc allnoconfig,
44x/ebony_defconfig and allyesconfig.

Below is a summary of the state of the merge.

We are up to 64 trees (counting Linus' and 8 trees of patches pending for
Linus' tree (which are mostly empty)), 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.

...

Previous thread: [Q]Can a file be dual licensed in upstream kernel? by pradeep singh rautela on Tuesday, April 29, 2008 - 1:37 am. (12 messages)

Next thread: [git patches] libata updates by Jeff Garzik on Tuesday, April 29, 2008 - 2:25 am. (1 message)