From: Robert Baldyga <r.baldyga@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Felipe Balbi <balbi@ti.com>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the usb-gadget tree with the vfs tree
Date: Wed, 17 Sep 2014 08:54:16 +0200 [thread overview]
Message-ID: <54193018.50808@samsung.com> (raw)
In-Reply-To: <20140917161658.2e4eb3f1@canb.auug.org.au>
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: 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).
>
Looks good for me.
Thanks
Robert Baldyga
next prev parent reply other threads:[~2014-09-17 6:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-17 6:16 linux-next: manual merge of the usb-gadget tree with the vfs tree Stephen Rothwell
2014-09-17 6:54 ` Robert Baldyga [this message]
2014-09-17 15:34 ` Felipe Balbi
2014-09-17 15:34 ` Felipe Balbi
2014-09-18 17:12 ` Felipe Balbi
2014-09-18 17:12 ` Felipe Balbi
2014-09-18 18:09 ` Al Viro
2014-09-18 18:16 ` Felipe Balbi
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=54193018.50808@samsung.com \
--to=r.baldyga@samsung.com \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.