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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 21 Mar 2012 21:40:55 +0100
From:	Samuel Ortiz <sameo@...ux.intel.com>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Donggeun Kim <dg77.kim@...sung.com>,
	Myungjoo Ham <myungjoo.ham@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>
Subject: Re: linux-next: build failure after merge of the final tree (mfd and
 input trees related)

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/