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

Stephen Rothwell
2011-01-10T04:33:05Z

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

Hi Guenter,

On Sun, 9 Jan 2011 19:46:38 -0800 Guenter Roeck <guenter.roeck@ericsson.com> wrote:
>
> thanks for the note. I suspected that would happen - sorry for the trouble.
>
> Jean, do you want to take Joe's pr_fmt change from my tree and apply it to yours,
> or should we just wait until the first of the trees was merged into Linus' tree ?
> If the latter, do you want to send your patches to Linus first, or should I go first ?
> I am ready to go.

I wouldn't worry too much, Linus is cleverer me and will work it out.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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