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

[Samuel Ortiz]

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/
--
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/