From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Steve Glendinning <steve.glendinning@smsc•com>,
Jean Delvare <khali@linux-fr•org>
Subject: linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree
Date: Fri, 2 Jul 2010 15:38:27 +1000 [thread overview]
Message-ID: <20100702153827.cecff5e6.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 710 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
MAINTAINERS drivers/hwmon/emc2103.c between commit
7c73bc52c98623e7ae2831ec8df80e882aa4087f ("hwmon: Add driver for SMSC
EMC2103 temperature monitor and fan controller") from the jdelvare-hwmon
tree and commit 3b52586d66843792f6556b3dd33205375d9b4196 ("hwmon: Add
driver for SMSC EMC2103 temperature monitor and fan controller") from the
driver-core tree.
Looks like two versions of the same patch. I used the newer one (from
the jdelvare-hwmon tree). I guess this should be dropped from one of the
two trees.
--
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 reply other threads:[~2010-07-02 5:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-02 5:38 Stephen Rothwell [this message]
2010-07-02 5:46 ` linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree Greg KH
2010-07-02 21:25 ` Greg KH
2010-07-03 0:28 ` 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=20100702153827.cecff5e6.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=khali@linux-fr$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=steve.glendinning@smsc$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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