Re: linux-next: manual merge of the kbuild tree with thehwmon-staging tree

[Guenter Roeck]

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/