lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the staging tree with the pm tree
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq:
generic DVFS framework with device-specific OPPs") from the pm tree and
commit 46a971913611 ("Staging: hv: move hyperv code out of staging
directory") from the staging tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/Kconfig
index a1efd75,ce3c35f..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -130,6 -130,6 +130,8 @@@ source "drivers/iommu/Kconfig

source "drivers/virt/Kconfig"

+ source "drivers/hv/Kconfig"
+
+source "drivers/devfreq/Kconfig"
+
endmenu
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-10-12 07:31    [W:0.030 / U:28.768 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site