Subject: Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 21 Feb 2011 13:31:16 +1100

Hi Guenter,

On Sun, 20 Feb 2011 18:17:08 -0800 Guenter Roeck <[email-masked]> wrote:
>
> yes, it would be great if you can carry the fix if it doesn't make too much trouble.
> I don't see an easy way around it.

These sort of conflict fixes are easy to carry ("git rerere" does it for me).

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/