On Fri, 20 Sep 2013, Guenter Roeck wrote: > On Tue, Sep 17, 2013 at 06:53:06PM -0000, Thomas Gleixner wrote: > > Use the proper function instead of fiddling with PREEMPT_ACTIVE and > > interrupt enable/disable in the low level code. > > > > Signed-off-by: Thomas Gleixner <[email protected]> > > Cc: Yoshinori Sato <[email protected]> > > Cc: Geert Uytterhoeven <[email protected]> > > > This will result in a conflict in -next as h8300 support has been removed > there, and I'll send a pull request to Linus in the next commit window.
An easy to resolve one methinks :) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

