* linux-next: manual merge of the usb tree with the tree
@ 2013-10-28 12:01 Stephen Rothwell
2013-10-31 22:16 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2013-10-28 12:01 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Srinivas Pandruvada, Jacob Pan,
Rafael J. Wysocki, Kishon Vijay Abraham I
[-- Attachment #1: Type: text/plain, Size: 747 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/Kconfig between commit 12cc4b3827f8 ("PowerCap: Add to drivers
Kconfig and Makefile") from the pm tree and commit ff764963479a
("drivers: phy: add generic PHY framework") from the usb 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/Kconfig
index 969e9871785c,8f451449abd3..000000000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig
source "drivers/fmc/Kconfig"
+source "drivers/powercap/Kconfig"
+
+ source "drivers/phy/Kconfig"
+
endmenu
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the usb tree with the tree
2013-10-28 12:01 linux-next: manual merge of the usb tree with the tree Stephen Rothwell
@ 2013-10-31 22:16 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2013-10-31 22:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Srinivas Pandruvada, Jacob Pan,
Rafael J. Wysocki, Kishon Vijay Abraham I
On Mon, Oct 28, 2013 at 11:01:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/Kconfig between commit 12cc4b3827f8 ("PowerCap: Add to drivers
> Kconfig and Makefile") from the pm tree and commit ff764963479a
> ("drivers: phy: add generic PHY framework") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks fine to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the usb tree with the tree
@ 2014-03-12 1:18 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-03-12 1:18 UTC (permalink / raw)
To: Greg KH, Shaibal Dutta, Tejun Heo; +Cc: linux-next, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the usb tree with the tree
@ 2014-03-12 1:05 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-03-12 1:05 UTC (permalink / raw)
To: Greg KH, Sebastian Hesselbarth, Kishon Vijay Abraham I
Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in arch/arm/mach-tegra/Kconfig between commit 06c886a95cbb533 ("phy: mvebu-sata: prepare new Dove DT Kconfig variable") from the USB tree and commit ff1f0018cf66 ("drivers: Enable building of Kirkwood drivers for mach-mvebu") from the mvebu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc drivers/phy/Kconfig
index 05711ea4fd15,8d3c49cc500f..000000000000
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -24,7 -27,7 +27,7 @@@ config PHY_EXYNOS_MIPI_VIDE
config PHY_MVEBU_SATA
def_bool y
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || MACH_DOVE
depends on OF
select GENERIC_PHY
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-12 1:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-28 12:01 linux-next: manual merge of the usb tree with the tree Stephen Rothwell
2013-10-31 22:16 ` Greg KH
2014-03-12 1:05 Mark Brown
2014-03-12 1:18 Mark Brown
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).