Message-ID: <4D834062.5040001@suse.cz>
Date: Fri, 18 Mar 2011 12:22:10 +0100
From: Michal Marek <mmarek@suse.cz>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101206 SUSE/3.1.7 Thunderbird/3.1.7
MIME-Version: 1.0
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        matt mooney <mfm@muteddisk.com>,
        Guenter Roeck <guenter.roeck@ericsson.com>
Subject: Re: linux-next: manual merge of the kbuild tree with the hwmon-staging
 tree
References: <20110318114836.04c76926.sfr@canb.auug.org.au>
In-Reply-To: <20110318114836.04c76926.sfr@canb.auug.org.au>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 751
Lines: 20

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/