Hi all,

Today's linux-next merge of the tip tree got conflicts in:

  drivers/cpufreq/Kconfig.x86
  drivers/cpufreq/Makefile

between commits:

  6fb302d2109c8 ("cpufreq: elanfreq: Drop support for AMD Elan SC4*")

from the pm tree and commit:

  435ef16e69b9d ("x86/cpu, cpufreq: Remove AMD ELAN support")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/cpufreq/Kconfig.x86
index 46b9742a16882,53025a063d2f4..0000000000000
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@@ -5,6 -5,7 +5,6 @@@
  
  config X86_INTEL_PSTATE
  	bool "Intel P state control"
 -	depends on X86
  	select ACPI_PROCESSOR if ACPI
  	select ACPI_CPPC_LIB if X86_64 && ACPI && SCHED_MC_PRIO
  	select CPU_FREQ_GOV_PERFORMANCE
@@@ -35,7 -36,7 +35,7 @@@ config X86_PCC_CPUFRE
  
  config X86_AMD_PSTATE
  	bool "AMD Processor P-State driver"
 -	depends on X86 && ACPI
 +	depends on ACPI
  	select ACPI_PROCESSOR
  	select ACPI_CPPC_LIB if X86_64
  	select CPU_FREQ_GOV_SCHEDUTIL if SMP
@@@ -71,7 -72,7 +71,7 @@@ config X86_AMD_PSTATE_DEFAULT_MOD
  
  config X86_AMD_PSTATE_UT
  	tristate "selftest for AMD Processor P-State driver"
 -	depends on X86 && ACPI_PROCESSOR
 +	depends on ACPI_PROCESSOR
  	depends on X86_AMD_PSTATE
  	default n
  	help
@@@ -113,17 -114,6 +113,6 @@@ config X86_ACPI_CPUFREQ_CP
  	  By enabling this option the acpi_cpufreq driver provides the old
  	  entry in addition to the new boost ones, for compatibility reasons.
  
- config SC520_CPUFREQ
- 	tristate "AMD Elan SC520"
- 	depends on MELAN
- 	help
- 	  This adds the CPUFreq driver for AMD Elan SC520 processor.
- 
- 	  For details, take a look at <file:Documentation/cpu-freq/>.
- 
- 	  If in doubt, say N.
- 
- 
  config X86_POWERNOW_K6
  	tristate "AMD Mobile K6-2/K6-3 PowerNow!"
  	depends on X86_32
diff --combined drivers/cpufreq/Makefile
index 8056b8f2200bd,6c7a39b7f8d26..0000000000000
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@@ -40,7 -40,6 +40,6 @@@ obj-$(CONFIG_X86_POWERNOW_K6)		+= power
  obj-$(CONFIG_X86_POWERNOW_K7)		+= powernow-k7.o
  obj-$(CONFIG_X86_LONGHAUL)		+= longhaul.o
  obj-$(CONFIG_X86_E_POWERSAVER)		+= e_powersaver.o
- obj-$(CONFIG_SC520_CPUFREQ)		+= sc520_freq.o
  obj-$(CONFIG_X86_LONGRUN)		+= longrun.o
  obj-$(CONFIG_X86_GX_SUSPMOD)		+= gx-suspmod.o
  obj-$(CONFIG_X86_SPEEDSTEP_ICH)		+= speedstep-ich.o