Re: linux-next: manual merge of the security tree with the vfs tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the security tree with the vfs tree
Date	2016-01-04 03:00 +0100
Message-ID	<qN2Bd-4ZX-7@gated-at.bofh.it> (permalink)
References	<qLD2a-7Vz-1@gated-at.bofh.it> <qN2hR-4Tf-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the security tree with the vfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-31 05:30 +0100
  Re: linux-next: manual merge of the security tree with the vfs tree Al Viro <viro@ZenIV.linux.org.uk> - 2015-12-31 05:40 +0100
    Re: linux-next: manual merge of the security tree with the vfs tree Petko Manolov <petkan@mip-labs.com> - 2015-12-31 11:50 +0100
      Re: linux-next: manual merge of the security tree with the vfs tree Al Viro <viro@ZenIV.linux.org.uk> - 2016-01-01 05:40 +0100
        Re: linux-next: manual merge of the security tree with the vfs tree Petko Manolov <petkan@mip-labs.com> - 2016-01-01 18:30 +0100
          Re: [PATCH] ima_write_policy() optimizations; kbuild test robot <lkp@intel.com> - 2016-01-01 18:50 +0100
  Re: linux-next: manual merge of the security tree with the vfs tree Mimi Zohar <zohar@linux.vnet.ibm.com> - 2016-01-04 02:40 +0100
    Re: linux-next: manual merge of the security tree with the vfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-04 03:00 +0100

csiph-web