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

Stephen Rothwell
2011-02-21T02:31:27Z

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

Hi Guenter,

On Sun, 20 Feb 2011 18:17:08 -0800 Guenter Roeck <guenter.roeck@ericsson.com> 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 sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]