From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@ti.com>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Robert Baldyga <r.baldyga@samsung.com>
Subject: linux-next: manual merge of the usb-gadget tree with the vfs tree
Date: Wed, 17 Sep 2014 16:16:58 +1000 [thread overview]
Message-ID: <20140917161658.2e4eb3f1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/function/f_fs.c between commit 8322215aa91c ("f_fs:
saner API for ffs_sb_create_file()") from the vfs tree and commit
1b0bf88fd8b8 ("usb: gadget: f_fs: virtual endpoint address mapping")
from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/gadget/function/f_fs.c
index 4726e278e557,4ad11e03cf54..000000000000
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@@ -1529,11 -1557,13 +1552,14 @@@ static int ffs_epfiles_create(struct ff
epfile->ffs = ffs;
mutex_init(&epfile->mutex);
init_waitqueue_head(&epfile->wait);
- sprintf(epfiles->name, "ep%u", i);
+ if (ffs->user_flags & FUNCTIONFS_VIRTUAL_ADDR)
+ sprintf(epfiles->name, "ep%02x", ffs->eps_addrmap[i]);
+ else
+ sprintf(epfiles->name, "ep%u", i);
- if (!unlikely(ffs_sb_create_file(ffs->sb, epfiles->name, epfile,
- &ffs_epfile_operations,
- &epfile->dentry))) {
+ epfile->dentry = ffs_sb_create_file(ffs->sb, epfiles->name,
+ epfile,
+ &ffs_epfile_operations);
+ if (unlikely(!epfile->dentry)) {
ffs_epfiles_destroy(epfiles, i - 1);
return -ENOMEM;
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-17 6:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-17 6:16 Stephen Rothwell [this message]
2014-09-17 6:54 ` linux-next: manual merge of the usb-gadget tree with the vfs tree Robert Baldyga
2014-09-17 15:34 ` Felipe Balbi
2014-09-18 17:12 ` Felipe Balbi
2014-09-18 18:09 ` Al Viro
2014-09-18 18:16 ` Felipe Balbi
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=20140917161658.2e4eb3f1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=r.baldyga@samsung.com \
--cc=viro@ZenIV.linux.org.uk \
/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