Hi all,

Changes since 20100401:

Dropped tree: tmio-mmc (long unresolved conflicts and unable to fetch)
	hwlat (at the maintainers request)

My fixes tree contains:
	a patch for a pktcdvd build error from Arnd Bergmann
	a fix for the commit that broke virtual consoles on PowerPC

The ceph tree lost its conflicts.

The hid tree lost its build failure.

The v4l-dvb tree gained a conflict against Linus' tree.

The kvm tree gained a build failure so I reverted the tree for today.

The net tree gained 2 conflicts against Linus' tree and a build failure
for which I reverted 2 commits.

The wireless tree gained a conflict against the wireless-current tree.

The sound tree gained a conflict against Linus' tree and a build failure
so I used the version from next-20100401.

The rr tree gained a conflict against the net tree.

The pcmcia tree gained a conflict against the net tree.

The mfd tree gained 2 build failures so I used the version from
next-20100401.

The slabh tree lost its build failure and all its conflicts.

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

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 ...
[ message continues ]

when CONFIG_PROC_FS is disabled:

linux-next-20100407/net/core/dev_addr_lists.c: In function 'dev_mc_net_init':
linux-next-20100407/net/core/dev_addr_lists.c:722: error: implicit declaration of function 'proc_net_fops_create'
linux-next-20100407/net/core/dev_addr_lists.c:722: error: 'dev_mc_seq_fops' undeclared (first use in this function)
linux-next-20100407/net/core/dev_addr_lists.c:722: error: (Each undeclared identifier is reported only once
linux-next-20100407/net/core/dev_addr_lists.c:722: error: for each function it appears in.)
linux-next-20100407/net/core/dev_addr_lists.c: In function 'dev_mc_net_exit':
linux-next-20100407/net/core/dev_addr_lists.c:729: error: implicit declaration of function 'proc_net_remove'
make[3]: *** [net/core/dev_addr_lists.o] Error 1

---
~Randy
--

[ message continues ]

Thanks Randy, this should correct this

[PATCH net-next-2.6] net: include linux/proc_fs.h in dev_addr_lists.c

As pointed by Randy Dunlap, we must include linux/proc_fs.h in
net/core/dev_addr_lists.c, regardless of CONFIG_PROC_FS

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>, 
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index 37d5975..508f9c1 100644
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -14,6 +14,7 @@
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/list.h>
+#include <linux/proc_fs.h>
 
 /*
  * General list handling functions
@@ -667,7 +668,6 @@ void dev_mc_init(struct net_device *dev)
 EXPORT_SYMBOL(dev_mc_init);
 
 #ifdef CONFIG_PROC_FS
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 static int dev_mc_seq_show(struct seq_file *seq, void *v)


--

[ message continues ]

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>



---
~Randy
--

[ message continues ]

From: Randy Dunlap <randy.dunlap@oracle.com>

Applied, thanks everyone.
--

[ message continues ]

My fixes series (not-a-tree) contains:
. build fix for gspca=m, INPUT=[mn] (from me)
. build fix for hid-picolcd=y and other dependencies=m (from bonbons@linux-vserver.org)
. build fix for staging/dt3155/ when builtin (from me)
. build fix for usbserial generic.c when CONFIG_MAGIC_SYSRQ is not enabled (from me)
. build fix for xen/manage.c when CONFIG_MAGIC_SYSRQ is not enabled (from me)


---
~Randy
--

[ message continues ]