public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>,
	Eric Van Hensbergen <ericvh@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>
Subject: linux-next: manual merge of the vfs tree with the v9fs tree
Date: Tue, 7 Apr 2015 14:05:06 +1000	[thread overview]
Message-ID: <20150407140506.387fedcb@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
net/9p/protocol.c between commit 6250a8badb31 ("9p: use unsigned
integers for nwqid/count") from the v9fs tree and commit 3f39ef33084b
("net/9p: switch the guts of p9_client_{read,write}() to iov_iter")
from the vfs tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

diff --cc net/9p/protocol.c
index 305e4789f2cc,e9d0f0c1a048..000000000000
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@@ -437,23 -439,13 +439,13 @@@ p9pdu_vwritef(struct p9_fcall *pdu, in
  						 stbuf->extension, stbuf->n_uid,
  						 stbuf->n_gid, stbuf->n_muid);
  			} break;
- 		case 'D':{
- 				uint32_t count = va_arg(ap, uint32_t);
- 				const void *data = va_arg(ap, const void *);
- 
- 				errcode = p9pdu_writef(pdu, proto_version, "d",
- 									count);
- 				if (!errcode && pdu_write(pdu, data, count))
- 					errcode = -EFAULT;
- 			}
- 			break;
- 		case 'U':{
+ 		case 'V':{
 -				int32_t count = va_arg(ap, int32_t);
 +				uint32_t count = va_arg(ap, uint32_t);
- 				const char __user *udata =
- 						va_arg(ap, const void __user *);
+ 				struct iov_iter *from =
+ 						va_arg(ap, struct iov_iter *);
  				errcode = p9pdu_writef(pdu, proto_version, "d",
  									count);
- 				if (!errcode && pdu_write_u(pdu, udata, count))
+ 				if (!errcode && pdu_write_u(pdu, from, count))
  					errcode = -EFAULT;
  			}
  			break;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

next             reply	other threads:[~2015-04-07  4:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-07  4:05 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-13  0:37 linux-next: manual merge of the vfs tree with the v9fs tree Stephen Rothwell
2013-10-29  2:46 Stephen Rothwell
2012-01-06  2:46 Stephen Rothwell
2012-01-07  4:38 ` Eric Van Hensbergen
2012-01-07  6:44   ` Stephen Rothwell

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=20150407140506.387fedcb@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=ericvh@gmail$(echo .)com \
    --cc=kirill.shutemov@linux$(echo .)intel.com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=viro@ZenIV$(echo .)linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox