On Wed, Nov 26, 2008 at 06:15:43PM +1100, Stephen Rothwell wrote: > Hi Dave, > > Today's linux-next build (x86_64 allmodconfig) failed like this: > > net/bridge/br_netfilter.c:112: error: unknown field 'entry_size' specified in initializer > net/bridge/br_netfilter.c:112: warning: initialization makes pointer from integer without a cast > > Caused by commit 631339f1e544a4d39a63cfe6708c5bddcd5a2c48 ("bridge: > netfilter: fix update_pmtu crash with GRE") from the net-current tree > interacting with commit 6bb3ce25d05f2990c8a19adaf427531430267c1f ("net: > remove struct dst_entry::entry_size") from the net tree. > > I added the below patch as a temporary merge fix. Yes your patch is correct. Thanks Stephen! -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html