From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Petko Manolov <petkan@mip-labs.com>
Subject: Re: linux-next: manual merge of the integrity tree with the vfs tree
Date: Mon, 4 Jan 2016 03:16:21 +0000 [thread overview]
Message-ID: <20160104031621.GP9938@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20160104135221.0e5515ac@canb.auug.org.au>
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
next prev parent reply other threads:[~2016-01-04 3:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-04 2:52 linux-next: manual merge of the integrity tree with the vfs tree Stephen Rothwell
2016-01-04 2:58 ` Stephen Rothwell
2016-01-04 3:16 ` Al Viro [this message]
2016-01-04 5:06 ` Mimi Zohar
2016-01-04 5:23 ` Stephen Rothwell
2016-01-04 12:32 ` Mimi Zohar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160104031621.GP9938@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=dmitry.kasatkin@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=petkan@mip-labs.com \
--cc=sfr@canb.auug.org.au \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).