From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Joe Perches <joe@perches.com>, Juerg Haefliger <juergh@gmail.com>,
Jean Delvare <khali@linux-fr.org>
Subject: Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree
Date: Mon, 10 Jan 2011 15:32:52 +1100 [thread overview]
Message-ID: <20110110153252.7b293aa0.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20110110034638.GA28007@ericsson.com>
[-- 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 --]
next prev parent reply other threads:[~2011-01-10 4:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-10 2:20 linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree Stephen Rothwell
2011-01-10 3:46 ` Guenter Roeck
2011-01-10 4:32 ` Stephen Rothwell [this message]
2011-01-10 8:57 ` Jean Delvare
2011-01-10 10:16 ` Guenter Roeck
2011-01-10 10:47 ` Jean Delvare
2011-01-10 11:11 ` Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2011-02-21 1:19 Stephen Rothwell
2011-02-21 2:17 ` Guenter Roeck
2011-02-21 2:31 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110110153252.7b293aa0.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=guenter.roeck@ericsson.com \
--cc=joe@perches.com \
--cc=juergh@gmail.com \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox