From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rong Wang <Rong.Wang@csr.com>, Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Date: Tue, 30 Jul 2013 14:08:10 +1000 [thread overview]
Message-ID: <20130730140810.a61155d064e33248faef323b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc-core.c between commit 1894870eb424 ("usb: gadget:
udc-core: fix the typo of udc state attribute") from the usb.current tree
and commit 5702f75375aa ("usb: gadget: udc-core: move sysfs_notify() to a
workqueue") 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/udc-core.c
index 13e25f8,3122ab9..0000000
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ
/* ------------------------------------------------------------------------- */
+ static void usb_gadget_state_work(struct work_struct *work)
+ {
+ struct usb_gadget *gadget = work_to_gadget(work);
+
- sysfs_notify(&gadget->dev.kobj, NULL, "status");
++ sysfs_notify(&gadget->dev.kobj, NULL, "state");
+ }
+
void usb_gadget_set_state(struct usb_gadget *gadget,
enum usb_device_state state)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-07-30 4:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-30 4:08 Stephen Rothwell [this message]
2013-07-30 5:50 ` linux-next: manual merge of the usb-gadget tree with the usb.current tree Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2015-05-28 8:36 Stephen Rothwell
2015-01-16 6:23 Stephen Rothwell
2015-01-16 9:56 ` Kaukab, Yousaf
2015-01-13 4:06 Stephen Rothwell
2015-01-13 4:02 Stephen Rothwell
2014-09-08 7:09 Stephen Rothwell
2014-09-08 7:02 Stephen Rothwell
2014-09-08 13:27 ` Felipe Balbi
2014-07-04 4:51 Stephen Rothwell
2013-12-18 6:09 Stephen Rothwell
2013-03-22 3:31 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
2013-03-22 3:28 Stephen Rothwell
2013-03-22 6:28 ` 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=20130730140810.a61155d064e33248faef323b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Rong.Wang@csr.com \
--cc=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).