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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
