Re: linux-next: manual merge of the kbuild tree with the hwmon-stagingtree
From: Michal Marek
Date: Fri Mar 18 2011 - 07:22:21 EST
On 18.3.2011 01:48, 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.
> Just context changes. I fixed it up (see below) and can carry the fix as
I am aware of the conflict, but as you say, it is just changed context.
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/