Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1300454

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

Show all headers | View raw

On Mon, Jan 04, 2016 at 01:52:21PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the integrity tree got a conflict in:
> 
>   security/integrity/ima/ima_fs.c
> 
> between commit:
> 
>   3bc8f29b149e ("new helper: memdup_user_nul()")
> 
> from the vfs tree and commit:
> 
>   6427e6c71c8b ("ima: ima_write_policy() limit locking")
> 
> from the integrity tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

FWIW, I'm going to pull the part that introduces memdup_user_nul() into
a never-rebased branch and if security.git is willing to pull it and handle
that conversion in ima_write_policy() themselves, I'll be only glad to drop
the corresponding chunk in vfs.git#for-next
--
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 | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the integrity tree with the vfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-04 04:00 +0100
  Re: linux-next: manual merge of the integrity tree with the vfs tree Al Viro <viro@ZenIV.linux.org.uk> - 2016-01-04 04:20 +0100
    Re: linux-next: manual merge of the integrity tree with the vfs tree Mimi Zohar <zohar@linux.vnet.ibm.com> - 2016-01-04 06:10 +0100
      Re: linux-next: manual merge of the integrity tree with the vfs  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-04 06:30 +0100
        Re: linux-next: manual merge of the integrity tree with the vfs tree Mimi Zohar <zohar@linux.vnet.ibm.com> - 2016-01-04 13:40 +0100

csiph-web