From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Ying Xue <ying.xue@windriver.com>
Subject: linux-next: manual merge of the net-next tree with the vfs tree
Date: Fri, 13 Mar 2015 13:15:43 +1100 [thread overview]
Message-ID: <20150313131543.7c050492@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/socket.c between commits 005139a14660 ("fs: remove ki_nbytes") and
e9eab93cc2dc ("fs: don't allow to complete sync iocbs through
aio_complete") from the vfs tree and commit 1b784140474e ("net: Remove
iocb argument from sendmsg and recvmsg") from the net-next tree.
I fixed it up (mainly using the net-next version - see below) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/socket.c
index f6c519d7b3ba,95d3085cb477..000000000000
--- a/net/socket.c
+++ b/net/socket.c
@@@ -855,11 -807,10 +807,10 @@@ static ssize_t sock_read_iter(struct ki
if (iocb->ki_pos != 0)
return -ESPIPE;
- if (iocb->ki_nbytes == 0) /* Match SYS5 behaviour */
+ if (!iov_iter_count(to)) /* Match SYS5 behaviour */
return 0;
- res = __sock_recvmsg(iocb, sock, &msg,
- iov_iter_count(to), msg.msg_flags);
- res = sock_recvmsg(sock, &msg, iocb->ki_nbytes, msg.msg_flags);
++ res = sock_recvmsg(sock, &msg, iov_iter_count(to), msg.msg_flags);
*to = msg.msg_iter;
return res;
}
@@@ -880,7 -831,7 +831,7 @@@ static ssize_t sock_write_iter(struct k
if (sock->type == SOCK_SEQPACKET)
msg.msg_flags |= MSG_EOR;
- res = __sock_sendmsg(iocb, sock, &msg, iov_iter_count(from));
- res = sock_sendmsg(sock, &msg, iocb->ki_nbytes);
++ res = sock_sendmsg(sock, &msg, iov_iter_count(from));
*from = msg.msg_iter;
return res;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-13 2:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-13 2:15 Stephen Rothwell [this message]
2015-03-13 3:24 ` linux-next: manual merge of the net-next tree with the vfs tree David Miller
2015-03-13 3:56 ` Al Viro
2015-03-13 4:38 ` Stephen Rothwell
2015-03-13 16:37 ` Al Viro
2015-03-13 4:52 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2018-05-17 1:34 Stephen Rothwell
2018-05-17 6:47 ` Christoph Hellwig
2018-01-25 6:41 Stephen Rothwell
2018-01-09 23:34 Stephen Rothwell
2017-12-08 0:33 Stephen Rothwell
2017-04-07 0:22 Stephen Rothwell
2015-03-30 3:24 Stephen Rothwell
2015-03-30 3:08 Stephen Rothwell
2014-11-25 2:42 Stephen Rothwell
2014-11-25 11:23 ` Marcelo Ricardo Leitner
2014-11-25 15:56 ` Pablo Neira Ayuso
2012-09-05 2:02 Stephen Rothwell
2012-09-05 4:55 ` Masatake YAMATO
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150313131543.7c050492@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
--cc=ying.xue@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).