Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index f45c5e70773c..d3d28919d4b4 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -77,8 +77,7 @@ static int prepare_reply(struct genl_info *info, u8 cmd, struct sk_buff **skbp,
         /*
          * If new attributes are added, please revisit this allocation
          */
-        size = nlmsg_total_size(genlmsg_total_size(size));
-        skb = nlmsg_new(size, GFP_KERNEL);
+        skb = genlmsg_new(size, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
@@ -86,13 +85,9 @@ static int prepare_reply(struct genl_info *info, u8 cmd, struct sk_buff **skbp,
                 int seq = get_cpu_var(taskstats_seqnum)++;
                 put_cpu_var(taskstats_seqnum);
 
-                reply = genlmsg_put(skb, 0, seq,
-                                family.id, 0, 0,
-                                cmd, family.version);
+                reply = genlmsg_put(skb, 0, seq, &family, 0, cmd);
         } else
-                reply = genlmsg_put(skb, info->snd_pid, info->snd_seq,
-                                family.id, 0, 0,
-                                cmd, family.version);
+                reply = genlmsg_put_reply(skb, info, &family, 0, cmd);
         if (reply == NULL) {
                 nlmsg_free(skb);
                 return -EINVAL;