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

From: Christian Borntraeger <[email-masked]>
Date: Wed, 25 Jun 2008 08:38:40 +0200

Am Mittwoch, 25. Juni 2008 schrieb Stephen Rothwell:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> drivers/char/hvc_console.h between commit
> 1c8950ff87de950a3b6ccfb26650fc0a56278836 ("[POWERPC] Make cpus_in_xmon
> static and remove extern mess from hvc_console.c") from the powerpc tree
> and commit c9a834016cfb2b0fb71392fddab4d80ab9f9d172 ("hvc_console: rework
> setup to replace irq functions with callbacks") from the rr tree.
> 
> Just a matter of overlapping additions.

Yes, it looks simple. What is the preferred way of solving such conflicts in 
linux-next?