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

2014-09-18 Thread Felipe Balbi
Hi, On Thu, Sep 18, 2014 at 07:09:21PM +0100, Al Viro wrote: > > > > 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: > > > > > > I can't find this commit on linux-usb. In fact, googling for it the

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

2014-09-18 Thread Al Viro
On Thu, Sep 18, 2014 at 12:12:26PM -0500, Felipe Balbi wrote: > Hi, > > On Wed, Sep 17, 2014 at 10:34:00AM -0500, Felipe Balbi wrote: > > On Wed, Sep 17, 2014 at 04:16:58PM +1000, Stephen Rothwell wrote: > > > Hi Felipe, > > > > > > Today's linux-next merge of the usb-gadget tree got a conflict

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

2014-09-18 Thread Felipe Balbi
Hi, On Wed, Sep 17, 2014 at 10:34:00AM -0500, Felipe Balbi wrote: > On Wed, Sep 17, 2014 at 04:16:58PM +1000, Stephen Rothwell wrote: > > 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

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

2014-09-18 Thread Felipe Balbi
Hi, On Wed, Sep 17, 2014 at 10:34:00AM -0500, Felipe Balbi wrote: On Wed, Sep 17, 2014 at 04:16:58PM +1000, Stephen Rothwell wrote: 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: I

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

2014-09-18 Thread Al Viro
On Thu, Sep 18, 2014 at 12:12:26PM -0500, Felipe Balbi wrote: Hi, On Wed, Sep 17, 2014 at 10:34:00AM -0500, Felipe Balbi wrote: On Wed, Sep 17, 2014 at 04:16:58PM +1000, Stephen Rothwell wrote: Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in

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

2014-09-18 Thread Felipe Balbi
Hi, On Thu, Sep 18, 2014 at 07:09:21PM +0100, Al Viro wrote: 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: I can't find this commit on linux-usb. In fact, googling for it the only reference

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

2014-09-17 Thread Felipe Balbi
On Wed, Sep 17, 2014 at 04:16:58PM +1000, Stephen Rothwell wrote: > 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: I can't find this commit on linux-usb. In fact, googling for it the only

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

2014-09-17 Thread Robert Baldyga
On 09/17/2014 08:16 AM, Stephen Rothwell wrote: > 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:

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

2014-09-17 Thread Stephen Rothwell
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

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

2014-09-17 Thread Stephen Rothwell
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

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

2014-09-17 Thread Robert Baldyga
On 09/17/2014 08:16 AM, Stephen Rothwell wrote: 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:

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

2014-09-17 Thread Felipe Balbi
On Wed, Sep 17, 2014 at 04:16:58PM +1000, Stephen Rothwell wrote: 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: I can't find this commit on linux-usb. In fact, googling for it the only