linux-kernel - linux-next: manual merge of the usb-gadget tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140917161658.2e4eb3f1@canb.auug.org.au>
Date:	Wed, 17 Sep 2014 16:16:58 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felipe Balbi <balbi@...com>, Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Robert Baldyga <r.baldyga@...sung.com>
Subject: linux-next: manual merge of the usb-gadget tree with the vfs tree

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@...b.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;
  		}

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)