Hi all,

Changes since next-20080814:

New trees: oprofile and fastboot.

The tip-core tree lost its conflict.

The cpus4096 tree lost its conflict.

The ftrace tree gained a conflict against the driver-core tree and a
build failure required the revert of a commit.

The stackprotector tree gained a conflict against the ftrace tree.

The x86 tree gained a conflict against the stackprotector tree but lost
two conflicts and a build fix patch.

The kvm tree gained a conflict against the x86 tree.

The test tree gained a conflict against the sched tree.

The kmemcheck tree gained two conflicts against the x86 tree.

The hdlc tree lost its build fix patch.

The creds tree gained a conflict against the ftrace tree (and several
against Linus' tree - but they were expected).

The fastboot tree gained a conflist against the driver-core tree.

I have also applied the following patches for known problems:

	Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
	ath9k: work around gcc ICE again
	driver-core: don't export static functions

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

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

When VLAN is not enabled, bnx2 build fails with:

drivers/net/bnx2.c: In function 'bnx2_rx_int':
drivers/net/bnx2.c:2959: error: dereferencing pointer to incomplete type
drivers/net/bnx2.c:2960: error: dereferencing pointer to incomplete type
make[2]: *** [drivers/net/bnx2.o] Error 1


on these lines:

				ve->h_vlan_proto = htons(ETH_P_8021Q);
				ve->h_vlan_TCI = htons(vtag);


---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
--

[ message continues ]

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

Does this fix it for you?

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index d454810..2486a65 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -35,8 +35,8 @@
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #include <linux/if_vlan.h>
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define BCM_VLAN 1
 #endif
 #include <net/ip.h>
--

[ message continues ]

--

[ message continues ]

Hi,

where can I see where all the branches com from, especially fastboot?
The wiki is somewhat outdated regarding the "IncludedTrees" page.

Regards,
Tino
--

[ message continues ]