Hi all,

Changes since next-20080520:

New trees: input-current, rcu, locking, safe-poison-pointers,
stackprotector and input.

Three patches have been reverted in the driver-core tree as they have
been merged into the pci tree (I expect that they will not be in the
driver-core tree tomorrow).

The driver-core build error went away.

The sound tree required two patches for build problems.

The semaphore-removal tree still needed three patches reverted because simi=
lar
patches were merged into upstream and the scsi-rc-fixes trees.

I have applied the following temporary patch for known build problems:

	"Fix various 8390 builds" - the net tree broke builds on various
architectures - hopefully this patch will go into the net tree shortly.

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 81 trees (counting Linus' and 13 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 ...
[ message continues ]

Hi Stephen,

The next-20080521 kernel build fails, on x86_64 machine 

CC net/netfilter/nf_conntrack_helper.o
net/netfilter/nf_conntrack_helper.c: In function ‘__nf_ct_helper_find’:
net/netfilter/nf_conntrack_helper.c:58: error: implicit declaration of function ‘hlist_for_each_entry_rcu’
net/netfilter/nf_conntrack_helper.c:58: error: ‘hnode’ undeclared (first use in this function)
net/netfilter/nf_conntrack_helper.c:58: error: (Each undeclared identifier is reported only once
net/netfilter/nf_conntrack_helper.c:58: error: for each function it appears in.)
net/netfilter/nf_conntrack_helper.c:58: error: expected ‘;’ before ‘{’ token
net/netfilter/nf_conntrack_helper.c:50: warning: unused variable ‘mask’
net/netfilter/nf_conntrack_helper.c: In function ‘__nf_conntrack_helper_find_byname’:
net/netfilter/nf_conntrack_helper.c:74: error: ‘hnode’ undeclared (first use in this function)
net/netfilter/nf_conntrack_helper.c:74: error: expected ‘;’ before ‘{’ token
net/netfilter/nf_conntrack_helper.c: In function ‘nf_conntrack_helper_register’:
net/netfilter/nf_conntrack_helper.c:117: error: implicit declaration of function ‘hlist_add_head_rcu’
net/netfilter/nf_conntrack_helper.c: In function ‘nf_conntrack_helper_unregister’:
net/netfilter/nf_conntrack_helper.c:133: error: implicit declaration of function ‘hlist_del_rcu’
make[2]: *** [net/netfilter/nf_conntrack_helper.o] Error 1
make[1]: *** [net/netfilter] Error 2
make: *** [net] Error 2

This build error is because of the missing include file.I have tested
the patch for the build failure only.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
--- linux-2.6.26-rc3/net/netfilter/nf_conntrack_helper.c	2008-05-20 20:24:14.000000000 +0530
+++ linux-2.6.26-rc3/net/netfilter/~nf_conntrack_helper.c	2008-05-22 00:17:32.000000000 +0530
@@ -20,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
+#include <linux/rculist.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include ...
[ message continues ]

Hi Kamalesh,

On Wed, 21 May 2008 17:02:30 +0530 Kamalesh Babulal <kamalesh@linux.vnet.ib=

Thanks for the report and patch.  This looks like it is probably broken in
Linus' kernel.  What config did you use to get the error?

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[ message continues ]

>> net/netfilter/nf_conntrack_helper.c: In function 
[ message continues ]

Hi all,


Actually this is caused by the splitting out of the rcu stuff from list.h
that is in linux-next, sorry.

Your patch looks good to me (reproduced below for new cc's).

Ingo, this should probably go into the rcu tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Date: Wed, 21 May 2008 17:02:30 +0530
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Subject: [PATCH] linux-next: Tree for May 21 - build failure with netfilter on __nf_ct_helper_find()

The next-20080521 kernel build fails, on x86_64 machine 

CC net/netfilter/nf_conntrack_helper.o
net/netfilter/nf_conntrack_helper.c: In function ‘__nf_ct_helper_find’:
net/netfilter/nf_conntrack_helper.c:58: error: implicit declaration of function ‘hlist_for_each_entry_rcu’
net/netfilter/nf_conntrack_helper.c:58: error: ‘hnode’ undeclared (first use in this function)
net/netfilter/nf_conntrack_helper.c:58: error: (Each undeclared identifier is reported only once
net/netfilter/nf_conntrack_helper.c:58: error: for each function it appears in.)
net/netfilter/nf_conntrack_helper.c:58: error: expected ‘;’ before ‘{’ token
net/netfilter/nf_conntrack_helper.c:50: warning: unused variable ‘mask’
net/netfilter/nf_conntrack_helper.c: In function ‘__nf_conntrack_helper_find_byname’:
net/netfilter/nf_conntrack_helper.c:74: error: ‘hnode’ undeclared (first use in this function)
net/netfilter/nf_conntrack_helper.c:74: error: expected ‘;’ before ‘{’ token
net/netfilter/nf_conntrack_helper.c: In function ‘nf_conntrack_helper_register’:
net/netfilter/nf_conntrack_helper.c:117: error: implicit declaration of function ‘hlist_add_head_rcu’
net/netfilter/nf_conntrack_helper.c: In function ‘nf_conntrack_helper_unregister’:
net/netfilter/nf_conntrack_helper.c:133: error: implicit declaration of function ‘hlist_del_rcu’
make[2]: *** [net/netfilter/nf_conntrack_helper.o] Error 1
make[1]: *** [net/netfilter] Error 2
make: *** [net] Error 2

This build error is because of the missing ...
[ message continues ]

this bug has been fixed in the -tip tree 9 days ago:

|  commit db3c7a9f07a212d1774e6b432a08b231340e984d
|  Author: Ingo Molnar <mingo@elte.hu>
|  Date:   Tue May 13 15:37:05 2008 +0200

that commit was in intermediate testing phase in the 'scratch' branch, 
and a few days ago linux-next stopped picking up the scratch branch.

I've now cherry-picked this fix over into the rcu branch and everything 
should be fine again in the next linux-next iteration.

	Ingo
--

[ message continues ]

Hi Ingo,


OK, thanks.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[ message continues ]