Hi Mimi, On Sun, 03 Jan 2016 20:37:20 -0500 Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> wrote: > > FYI, I pushed out Petko's patch to linux-integrity/next earlier today. > His patch moves taking the ima_write_mutex to after the the call to > copy_from_user(), as discussed. This obviously won't fix the conflict > with Al's patch. How do you want to handle it? Do I need to do > anything? No, I will just do a different conflict resolution. I will send the usual email when I get to it. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
