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

From: Michal Marek <[email-masked]>
Date: Fri, 18 Mar 2011 12:22:10 +0100

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
> necessary.

I am aware of the conflict, but as you say, it is just changed context.

Thanks,
Michal