Subject: Re: linux-next: build failure after merge of the final tree (mfd and input trees related)

From: Samuel Ortiz <[email-masked]>
Date: Wed, 21 Mar 2012 21:40:55 +0100

Hi Dmitry, Stephen,

On Wed, Mar 21, 2012 at 01:03:13AM -0700, Dmitry Torokhov wrote:
> > Caused by a bad merge of commits 104594b01ce7 ("Input: add driver support
> > for MAX8997-haptic") from the input tree and 02b09703e7a4 ("mfd: Add
> > platform data for MAX8997 haptic driver") from the mfd tree.
> 
> Sorry about this. I thought Samuel was going to revert the platform data
> from his tree as he OKed applying the combined patch...
My fault indeed. The commit is reverted now.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/