Re: linux-next: rr tree build failure

[Rusty Russell <rusty@rustcorp.com.au>]

On Thursday 23 October 2008 15:51:59 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> arch/x86/xen/smp.c: In function 'xen_smp_send_call_function_ipi':
> arch/x86/xen/smp.c:423: error: incompatible type for argument 1 of
> 'xen_send_IPI_mask' arch/x86/kernel/smp.c: In function
> 'native_send_call_func_ipi':
> arch/x86/kernel/smp.c:140: error: incompatible type for argument 1 of
> 'genapic->send_IPI_mask'
>
> Caused by a interaction between commit
> ae74da38ccdad1c0d724fc9343b917bc63ed6fc3 ("x86: reduce stack requirements
> for send_call_func_ipi") from the cpus4096 tree and commit
> b93ce7906b8546093696e03e9a3797da8cef2274 ("x86 smp: modify send_IPI_mask
> interface to accept cpumask_t pointers") from the rr tree.
>
> Fixed up in the patch below.

Yep, genuine conflict, fix is correct.

Thanks,
Rusty.