On Mon, Nov 21, 2011 at 11:16 PM, Will Deacon <will.deacon@xxxxxxx> wrote: > On Mon, Nov 21, 2011 at 02:53:54PM +0000, Ming Lei wrote: >> On Mon, Nov 21, 2011 at 9:58 PM, Will Deacon <will.deacon@xxxxxxx> wrote: >> > On Sun, Nov 20, 2011 at 03:27:19AM +0000, Paul Walmsley wrote: >> >> The OMAP-specific parts should be queued up in my/Benoît's/Tony's trees, >> >> rather than placed directly into -next. Otherwise they are likely to >> >> generate merge conflicts with other OMAP changes that we may generate. >> >> >> >> So I'd suggest splitting patches 1-3 off into a separate series that Will >> >> can pass on to -next if he wishes. >> > >> > Fine by me. If Ming Lei posts a new series so that everything is in one >> > thread then I can pick out the bits I want. >> >> You mean the 3rd patch is the debugss patch posted by Benoit? >> The original 3rd patch is not needed any more once the debugss patch >> is taken. > > Ah sorry, I lost track a bit. In that case, I'll just keep hold of the two > patches I have and deal with them appropriately. Sorry too, :-) It should be that both 3/7 and 4/7 are not needed any more. Benoit's debugss patch will replace the 4/7 patch(introduce emu hwmod). thanks, -- Ming Lei -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
