linux-kernel - linux-next: manual merge of the usb tree with the 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>] [day] [month] [year] [list]

Message-Id: <20140312011801.4245384d14d877881c3f5a1e@kernel.org>
Date:	Wed, 12 Mar 2014 01:18:01 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Greg KH <greg@...ah.com>,
	Shaibal Dutta <shaibal.dutta@...adcom.com>,
	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the usb tree with the  tree

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 {

Content of type "application/pgp-signature" skipped