From: Mark Brown <broonie@kernel•org>
To: Greg KH <greg@kroah•com>,
Shaibal Dutta <shaibal.dutta@broadcom•com>,
Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the usb tree with the tree
Date: Wed, 12 Mar 2014 01:18:01 +0000 [thread overview]
Message-ID: <20140312011801.4245384d14d877881c3f5a1e@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1868 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in between commit 22f6a0f0e3549 ("usb: move hub init and LED blink work to power efficient workqueue") from the usb tree and commit 77fa83cf747820 ("usb: don't use PREPARE_DELAYED_WORK") from the workqueues tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc drivers/usb/core/hub.c
index 5cbf78d0be25,5da5394127e9..000000000000
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -1040,8 -1049,9 +1049,9 @@@ static void hub_activate(struct usb_hu
*/
if (type == HUB_INIT) {
delay = hub_power_on(hub, false);
- PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
+ INIT_DELAYED_WORK(&hub->init_work, hub_init_func2);
- schedule_delayed_work(&hub->init_work,
+ queue_delayed_work(system_power_efficient_wq,
+ &hub->init_work,
msecs_to_jiffies(delay));
/* Suppress autosuspend until init is done */
@@@ -1194,8 -1204,9 +1204,9 @@@
/* Don't do a long sleep inside a workqueue routine */
if (type == HUB_INIT2) {
- PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func3);
+ INIT_DELAYED_WORK(&hub->init_work, hub_init_func3);
- schedule_delayed_work(&hub->init_work,
+ queue_delayed_work(system_power_efficient_wq,
+ &hub->init_work,
msecs_to_jiffies(delay));
return; /* Continues at init3: below */
} else {
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-12 1:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 1:18 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-03-12 1:05 linux-next: manual merge of the usb tree with the tree Mark Brown
2013-10-28 12:01 Stephen Rothwell
2013-10-31 22:16 ` Greg KH
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=20140312011801.4245384d14d877881c3f5a1e@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shaibal.dutta@broadcom$(echo .)com \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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