Subject: Re: linux-next: manual merge of the rr tree with the s390 tree

From: Rusty Russell <[email-masked]>
Date: Tue, 17 Mar 2009 13:15:36 +1030

On Tuesday 17 March 2009 13:05:27 Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> arch/s390/include/asm/tlbflush.h between commit
> e6f19dbd10f5d871750ee3fb03e2e99a06eebf92 ("[S390] cpumask: use mm_cpumask
> () wrapper") from the s390 tree and commit
> 49797d75185490d793bd5bd5db50f143ee8c9d89 ("cpumask:use-mm_cpumask-s390")
> from the rr tree.
> 
> I assumed that the rr tree version was the correct version and used that.

Actually, they took my pull, and Martin mentioned a fix.

I'll drop my version from linux-next for tomorrow.

Thanks!
Rusty.