From: Mimi Zohar <zohar@linux•vnet.ibm.com>
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Dmitry Kasatkin <dmitry.kasatkin@gmail•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Petko Manolov <petkan@mip-labs•com>,
James Morris <jmorris@namei•org>
Subject: Re: linux-next: manual merge of the integrity tree with the vfs tree
Date: Mon, 04 Jan 2016 00:06:37 -0500 [thread overview]
Message-ID: <1451883997.2772.27.camel@linux.vnet.ibm.com> (raw)
In-Reply-To: <20160104031621.GP9938@ZenIV.linux.org.uk>
On Mon, 2016-01-04 at 03:16 +0000, Al Viro wrote:
> 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).
Thanks!
> 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
Al,
As memdup_user_nul() is not in the security tree, it would break the
security tree builds. Having the patch in the linux-integrity/next
branch wouldn't help matters.
Mimi
next prev parent reply other threads:[~2016-01-04 5:06 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
2016-01-04 5:06 ` Mimi Zohar [this message]
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=1451883997.2772.27.camel@linux.vnet.ibm.com \
--to=zohar@linux$(echo .)vnet.ibm.com \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=petkan@mip-labs$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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