public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Guenter Roeck <guenter.roeck@ericsson.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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: Sun, 9 Jan 2011 19:46:38 -0800	[thread overview]
Message-ID: <20110110034638.GA28007@ericsson.com> (raw)
In-Reply-To: <20110110132057.bc5d54a0.sfr@canb.auug.org.au>

On Sun, Jan 09, 2011 at 09:20:57PM -0500, Stephen Rothwell wrote:
> Hi Guenter,
> 
> Today's linux-next merge of the hwmon-staging tree got a conflict in
> drivers/hwmon/dme1737.c between commit
> b7f2a5c8c9190fcf0126d43972a8ad37eb98f5d0 ("hwmon: (dme1737) Minor
> cleanups") from the jdelvare-hwmon tree and commit
> 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb ("hwmon: (dme1737) Use pr_fmt
> and pr_<level>") from the hwmon-staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
Hi Stephen,

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.

Thanks,
Guenter

  reply	other threads:[~2011-01-10  3:46 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 [this message]
2011-01-10  4:32   ` Stephen Rothwell
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=20110110034638.GA28007@ericsson.com \
    --to=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 \
    --cc=sfr@canb.auug.org.au \
    /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