From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mimi Zohar <zohar@linux•vnet.ibm.com>
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, 4 Jan 2016 16:23:08 +1100 [thread overview]
Message-ID: <20160104162308.52349acd@canb.auug.org.au> (raw)
In-Reply-To: <1451883997.2772.27.camel@linux.vnet.ibm.com>
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next prev parent reply other threads:[~2016-01-04 5:23 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 [this message]
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=20160104162308.52349acd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=viro@ZenIV$(echo .)linux.org.uk \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/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