All of lore.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>,
	Jean Delvare <khali@linux-fr.org>
Subject: Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree
Date: Sun, 20 Feb 2011 18:17:08 -0800	[thread overview]
Message-ID: <20110221021708.GA7096@ericsson.com> (raw)
In-Reply-To: <20110221121944.57f2ecfb.sfr@canb.auug.org.au>

On Sun, Feb 20, 2011 at 08:19:44PM -0500, Stephen Rothwell wrote:
> Hi Guenter,
> 
> Today's linux-next merge of the hwmon-staging tree got a conflict in
> drivers/hwmon/Makefile between commits
> bb6cd76e2364b13de54314aeadd9f61b75335caa ("Let Kconfig handle lis3lv02d
> dependencies") and d8f00f1b531b25ac96a39385617ff1718bc8474b ("Move
> lis3lv02d drivers to drivers/misc") from the jdelvare-hwmon tree and
> commit 2c37a4a61ef4efaa7a802e0757d783d9b54ad064 ("hwmon: Add support for
> Lineage Compact Power Line PEM devices") from the hwmon-staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Hi Stephen,

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.

Thanks,
Guenter

  reply	other threads:[~2011-02-21  2:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-21  1:19 linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree Stephen Rothwell
2011-02-21  2:17 ` Guenter Roeck [this message]
2011-02-21  2:31   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2011-01-10  2:20 Stephen Rothwell
2011-01-10  3:46 ` Guenter Roeck
2011-01-10  4:32   ` Stephen Rothwell
2011-01-10  8:57   ` Jean Delvare
2011-01-10  8:57     ` Jean Delvare
2011-01-10 10:16     ` Guenter Roeck
2011-01-10 10:47       ` Jean Delvare
2011-01-10 10:47         ` Jean Delvare
2011-01-10 11:11         ` Guenter Roeck

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=20110221021708.GA7096@ericsson.com \
    --to=guenter.roeck@ericsson.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.