linux-next: manual merge of the cpufreq tree with the cpus4096 tree

linux-next: manual merge of the cpufreq tree with the cpus4096 tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the cpufreq tree got a conflict in
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between commit
5cd7376200be7b8bab085557ff5876b04bd84191 ("fix: crash: IP:
__bitmap_intersects+0x48/0x73") from the cpus4096 tree and commit
6fc619dc092a0a159cf5fb46afa52f2f8128b1d4 ("[CPUFREQ] checkpatch cleanups
for acpi-cpufreq") from the cpufreq tree.

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

diff --cc arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 0192767,cba5c6b..0000000
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@@ -138,15 -140,13 +140,13 @@@ struct io_addr 
  	u8 bit_width;
  };
  
- typedef union {
- 	struct msr_addr msr;
- 	struct io_addr io;
- } drv_addr_union;
- 
  struct drv_cmd {
  	unsigned int type;
 -	cpumask_var_t mask;
 +	const struct cpumask *mask;
- 	drv_addr_union addr;
+ 	union {
+ 		struct msr_addr msr;
+ 		struct io_addr io;
+ 	} addr;
  	u32 val;
  };
  

Re: linux-next: manual merge of the cpufreq tree with the cpus4096 tree

[Dave Jones]

On Tue, Jan 20, 2009 at 01:47:13PM +1100, Stephen Rothwell wrote:
 > Hi Dave,
 > 
 > Today's linux-next merge of the cpufreq tree got a conflict in
 > arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between commit
 > 5cd7376200be7b8bab085557ff5876b04bd84191 ("fix: crash: IP:
 > __bitmap_intersects+0x48/0x73") from the cpus4096 tree and commit
 > 6fc619dc092a0a159cf5fb46afa52f2f8128b1d4 ("[CPUFREQ] checkpatch cleanups
 > for acpi-cpufreq") from the cpufreq tree.
 > 
 > Just changing context.  I fixed it up (see below) and can carry the fix
 > as necessary.
 
Yep, looks sane.
I can't wait for this cpumask stuff to be over with, it's been a
pain in the ass for merge collisions.

	Dave

-- 
http://www.codemonkey.org.uk

Re: linux-next: manual merge of the cpufreq tree with the cpus4096 tree

[Ingo Molnar]

* Dave Jones <davej@redhat.com> wrote:

> On Tue, Jan 20, 2009 at 01:47:13PM +1100, Stephen Rothwell wrote:
>  > Hi Dave,
>  > 
>  > Today's linux-next merge of the cpufreq tree got a conflict in
>  > arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between commit
>  > 5cd7376200be7b8bab085557ff5876b04bd84191 ("fix: crash: IP:
>  > __bitmap_intersects+0x48/0x73") from the cpus4096 tree and commit
>  > 6fc619dc092a0a159cf5fb46afa52f2f8128b1d4 ("[CPUFREQ] checkpatch cleanups
>  > for acpi-cpufreq") from the cpufreq tree.
>  > 
>  > Just changing context.  I fixed it up (see below) and can carry the fix
>  > as necessary.
>  
> Yep, looks sane.
> I can't wait for this cpumask stuff to be over with, it's been a
> pain in the ass for merge collisions.

yeah, same here ... To resolve the conflicts you could merge the current 
x86 fixes tree:

 git pull git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus

that's all the pending stuff we have.

	Ingo