* linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree
@ 2010-07-02 5:38 Stephen Rothwell
2010-07-02 5:46 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-07-02 5:38 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Steve Glendinning, Jean Delvare
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree
2010-07-02 5:38 linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree Stephen Rothwell
@ 2010-07-02 5:46 ` Greg KH
2010-07-02 21:25 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2010-07-02 5:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Steve Glendinning, Jean Delvare
On Fri, Jul 02, 2010 at 03:38:27PM +1000, Stephen Rothwell wrote:
> 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.
Yes, it will be dropped from my tree tomorrow, sorry, I was busy with
the -stable stuff for the past few days.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree
2010-07-02 5:46 ` Greg KH
@ 2010-07-02 21:25 ` Greg KH
2010-07-03 0:28 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2010-07-02 21:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Steve Glendinning, Jean Delvare
On Thu, Jul 01, 2010 at 10:46:48PM -0700, Greg KH wrote:
> On Fri, Jul 02, 2010 at 03:38:27PM +1000, Stephen Rothwell wrote:
> > 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.
>
> Yes, it will be dropped from my tree tomorrow, sorry, I was busy with
> the -stable stuff for the past few days.
It is now removed from my tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-03 0:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-02 5:38 linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree Stephen Rothwell
2010-07-02 5:46 ` Greg KH
2010-07-02 21:25 ` Greg KH
2010-07-03 0:28 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox