From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
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 07:32:28 -0500 [thread overview]
Message-ID: <1451910748.2772.35.camel@linux.vnet.ibm.com> (raw)
In-Reply-To: <20160104162308.52349acd@canb.auug.org.au>
On Mon, 2016-01-04 at 16:23 +1100, Stephen Rothwell wrote:
> Hi Mimi,
>
> On Mon, 04 Jan 2016 00:06:37 -0500 Mimi Zohar <zohar@linux.vnet.ibm.com> wrote:
> >
> > On Mon, 2016-01-04 at 03:16 +0000, Al Viro wrote:
> > >
> > > 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
> >
> > 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.
>
> I think Al intends for you to merge his "never-rebased branch" that
> contains the memdup_user_nul patch into the integrity tree (or James to
> merge it into the security tree). He will also merge the same branch
> into his vfs tree and remove the patch that updates ima_write_policy()
> to use memdup_user_nul() and you (or James) could apply that patch in
> the integrity (or security) tree.
>
> This way we end up with the same commit creating memdup_user_nul() in
> both trees and no left over conflicts.
Thank you for the explanation. It sounds like a plan. James, are you
ok with this?
Mimi
prev parent reply other threads:[~2016-01-04 12:32 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
2016-01-04 5:23 ` Stephen Rothwell
2016-01-04 12:32 ` Mimi Zohar [this message]
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=1451910748.2772.35.camel@linux.vnet.ibm.com \
--to=zohar@linux.vnet.ibm.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=petkan@mip-labs.com \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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).