Messages in this thread | | | Date | Mon, 4 Jan 2016 12:55:12 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the security tree with the vfs tree |
| |
Hi Mimi,
On Sun, 03 Jan 2016 20:37:20 -0500 Mimi Zohar <zohar@linux.vnet.ibm.com> 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@canb.auug.org.au
| |