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

Conflicts:
	drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.

1 files changed, 4 insertions, 1 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index fc3ebb906911..51ab497115eb 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1501,6 +1501,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
         struct sk_buff *skb;
         int sent = 0;
         struct scm_cookie tmp_scm;
+        bool fds_sent = false;
 
         if (NULL == siocb->scm)
                 siocb->scm = &tmp_scm;
@@ -1562,12 +1563,14 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
                 size = min_t(int, size, skb_tailroom(skb));
 
                 memcpy(UNIXCREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
-                if (siocb->scm->fp) {
+                /* Only send the fds in the first buffer */
+                if (siocb->scm->fp && !fds_sent) {
                         err = unix_attach_fds(siocb->scm, skb);
                         if (err) {
                                 kfree_skb(skb);
                                 goto out_err;
                         }
+                        fds_sent = true;
                 }
 
                 err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);