linux-kernel - Re: linux-next: manual merge of the driver-core tree with the jdelvare-hwmon tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 2 Jul 2010 14:25:48 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Steve Glendinning <steve.glendinning@...c.com>,
	Jean Delvare <khali@...ux-fr.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 jdelvare-hwmon tree

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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/