linux-kernel - Re: linux-next: manual merge of the kbuild tree with the hwmon-staging 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]

Message-ID: <20110318035031.GA8242@ericsson.com>
Date:	Thu, 17 Mar 2011 20:50:31 -0700
From:	Guenter Roeck <guenter.roeck@...csson.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Michal Marek <mmarek@...e.cz>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	matt mooney <mfm@...eddisk.com>
Subject: Re: linux-next: manual merge of the kbuild tree with the
 hwmon-staging tree

Hi Stephen,

On Thu, Mar 17, 2011 at 08:48:36PM -0400, Stephen Rothwell wrote:
> Hi Michal,
> 
> Today's linux-next merge of the kbuild tree got a conflict in
> drivers/hwmon/Makefile between commit 442aba78728e ("hwmon: PMBus device
> driver") from the hwmon-staging tree and commit 5c39e31195f4 ("hwmon:
> change to new flag variable") from the kbuild tree.
> 

Linus merged the hwmon-staging tree, so the conflicts should hopefully
be resolved in a day or so.

Thanks,
Guenter
--
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/