Prev: linux-next: manual merge of the net tree with Linus' tree
Next: linux-next: manual merge of the wireless tree with the wireless-current tree
From: Stephen Rothwell on 6 Apr 2010 23:00 Hi Dave, After merging the wireless tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/cxgb4/cxgb4_main.c: In function 'set_addr_filters': drivers/net/cxgb4/cxgb4_main.c:264: error: dereferencing pointer to incomplete type drivers/net/cxgb4/cxgb4_main.c:265: error: dereferencing pointer to incomplete type Caused by commit b8ff05a9c3237f694a1c3bf8ceec3bf6c3c14b15 ("cxgb4: Add main driver file and driver Makefile") from Linus' tree interacting with commit 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to list_head"). The latter removed struct dev_addr_list. I have reverted commit b8ff05a9c3237f694a1c3bf8ceec3bf6c3c14b15 (and 43e9da8d782b8a40d5127fcc59ac2e543cf16d7d ("net: Hook up cxgb4 to Kconfig and Makefile") that depended on it) for today. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: David Miller on 6 Apr 2010 23:20 From: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Wed, 7 Apr 2010 12:58:17 +1000 > After merging the wireless tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/cxgb4/cxgb4_main.c: In function 'set_addr_filters': > drivers/net/cxgb4/cxgb4_main.c:264: error: dereferencing pointer to incomplete type > drivers/net/cxgb4/cxgb4_main.c:265: error: dereferencing pointer to incomplete type > > Caused by commit b8ff05a9c3237f694a1c3bf8ceec3bf6c3c14b15 ("cxgb4: Add > main driver file and driver Makefile") from Linus' tree interacting with > commit 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast > list to list_head"). The latter removed struct dev_addr_list. > > I have reverted commit b8ff05a9c3237f694a1c3bf8ceec3bf6c3c14b15 (and > 43e9da8d782b8a40d5127fcc59ac2e543cf16d7d ("net: Hook up cxgb4 to Kconfig > and Makefile") that depended on it) for today. Thanks, I'll merge net-2.6 into net-next-2.6 and fix this build failure in the latter. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 7 Apr 2010 01:30
Hi Dave, On Tue, 06 Apr 2010 20:12:20 -0700 (PDT) David Miller <davem(a)davemloft.net> wrote: > > Thanks, I'll merge net-2.6 into net-next-2.6 and fix this build > failure in the latter. Thanks for that. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |