On Thu, 2012-10-18 at 09:40 -0400, Steven Rostedt wrote:

Peter,

There was a little conflict with my merge of 3.4.14 due to the backport
of this patch:

commit 947ca1856a7e60aa6d20536785e6a42dff25aa6e
Author: Michael Wang [off-list ref]
Date:   Wed Sep 5 10:33:18 2012 +0800

    slab: fix the DEADLOCK issue on l3 alien lock

Could you just confirm that my fix is correct.

We forever keep getting that issue wrong it seems.. so I'd not put too
much trust into whatever my sleep addled brain thinks today :/

Looks about right, but who knows ;-)