Hi John, Today's linux-next merge of the wireless tree got a conflict in include/linux/netlink.h between commit c7ac8679bec9 ("rtnetlink: Compute and store minimum ifinfo dump size") from the net tree and commit 670dc2833d14 ("netlink: advertise incomplete dumps") from the wireless tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc include/linux/netlink.h index fdd0188,8d1bcec..0000000 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@@ -221,8 -221,8 +222,9 @@@ struct netlink_callback int (*dump)(struct sk_buff * skb, struct netlink_callback *cb); int (*done)(struct netlink_callback *cb); - int family; + u16 family; + u16 min_dump_alloc; + unsigned int prev_seq, seq; long args[6]; }; -- 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