From: James Morris <jmorris@namei.org>
To: Kees Cook <keescook@chromium.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-security-module <linux-security-module@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Pranith Kumar <bobby.prani@gmail.com>
Subject: Re: [PULL] seccomp update (next)
Date: Tue, 2 Dec 2014 18:56:15 +1100 (AEDT) [thread overview]
Message-ID: <alpine.LRH.2.11.1412021856050.22195@namei.org> (raw)
In-Reply-To: <CAGXu5jJnTskkGdAGTPXHEL8B_x7fc_57bQO16oqK6+KCKn09KQ@mail.gmail.com>
On Mon, 1 Dec 2014, Kees Cook wrote:
> On Mon, Dec 1, 2014 at 2:56 PM, James Morris <jmorris@namei.org> wrote:
> > On Mon, 1 Dec 2014, Kees Cook wrote:
> >
> >> On Thu, Nov 27, 2014 at 3:37 PM, James Morris <jmorris@namei.org> wrote:
> >> > On Wed, 26 Nov 2014, Kees Cook wrote:
> >> >
> >> >> > That would be because your tree is based on v3.17 and Kees' is based on
> >> >> > v3.18-rc6 ...
> >> >>
> >> >> James, I can base on whatever you like. I can do v3.17, or even
> >> >> against your security-next. It seems everyone uses something
> >> >> different. :)
> >> >
> >> > It's best to track my next branch as your upstream.
> >>
> >> It'll trigger collisions with what's the x86 -next from luto's
> >> changes. Should I just let Stephen sort that out?
> >
> > Yep.
>
> Hm, it depends on 54ef6df3f3f1353d99c80c437259d317b2cd1cbd, so basing
> against security-next would make the tree unbuildable. Perhaps I
> should just wait for -rc1 to land first?
Yep, that will work.
--
James Morris
<jmorris@namei.org>
next prev parent reply other threads:[~2014-12-02 7:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-25 19:43 [PULL] seccomp update (next) Kees Cook
2014-11-26 13:23 ` James Morris
2014-11-26 21:46 ` Stephen Rothwell
2014-11-26 21:59 ` Kees Cook
2014-11-27 23:37 ` James Morris
2014-12-01 20:34 ` Kees Cook
2014-12-01 22:56 ` James Morris
2014-12-01 23:06 ` Kees Cook
2014-12-02 7:56 ` James Morris [this message]
2015-07-15 18:56 Kees Cook
2015-07-20 6:58 ` James Morris
2016-01-05 23:40 Kees Cook
2016-06-14 17:57 Kees Cook
2016-06-17 7:15 ` James Morris
2016-06-17 18:55 ` Andy Lutomirski
2016-06-18 7:02 ` Kees Cook
2016-06-18 10:21 ` Andy Lutomirski
2016-06-19 22:45 ` Andy Lutomirski
2016-07-07 17:59 Kees Cook
2016-07-07 23:47 ` James Morris
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=alpine.LRH.2.11.1412021856050.22195@namei.org \
--to=jmorris@namei.org \
--cc=bobby.prani@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).