mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Morris <jmorris@namei.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	LSM List <linux-security-module@vger.kernel.org>
Subject: Re: [GIT PULL] Security subsystem updates for v4.16
Date: Thu, 1 Feb 2018 08:37:37 +1100 (AEDT)	[thread overview]
Message-ID: <alpine.LRH.2.21.1802010836080.13723@namei.org> (raw)
In-Reply-To: <CA+55aFw1vWWmv5Ebq9yWVDFm4SQUG_fNd3f5yoYkWRTfUNaL_Q@mail.gmail.com>

On Wed, 31 Jan 2018, Linus Torvalds wrote:

> On Sun, Jan 28, 2018 at 3:41 PM, James Morris <jmorris@namei.org> wrote:
> >
> > Note that individual trees may also be pulled via:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
> >         next-integrity
> >         next-smack
> >         next-tpm
> 
> So I did that, because it makes it easier and more controlled for me.
> But then when double-checking that the end result is identical to your
> full pull request, I end up missing the seccomp tree.

Ok, I'll send you separate pull requests for each branch from now on.

> 
> I can pull that separately too, but it was missing explanations and a
> real pull request, so I left it alone.
> 

Please pull:

The following changes since commit 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323:

  Linux 4.15-rc1 (2017-11-26 16:01:47 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-seccomp

for you to fetch changes up to 26025bf58b9fe3806ce4f92600e96a2c214c0d9c:

  Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-seccomp (2017-11-29 12:48:48 +1100)

----------------------------------------------------------------
James Morris (2):
      Merge tag 'v4.15-rc1' into next-seccomp
      Merge tag 'seccomp-next' of https://git.kernel.org/.../kees/linux into next-seccomp

Tycho Andersen (2):
      seccomp: hoist out filter resolving logic
      ptrace, seccomp: add support for retrieving seccomp metadata

 include/linux/seccomp.h     |   8 ++++
 include/uapi/linux/ptrace.h |   6 +++
 kernel/ptrace.c             |   4 ++
 kernel/seccomp.c            | 106 +++++++++++++++++++++++++++++++-------------
 4 files changed, 94 insertions(+), 30 deletions(-)

      reply	other threads:[~2018-01-31 21:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-28 23:41 James Morris
2018-01-31 21:21 ` Linus Torvalds
2018-01-31 21:37   ` James Morris [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=alpine.LRH.2.21.1802010836080.13723@namei.org \
    --to=jmorris@namei.org \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /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

all inboxes | Powered by JetHome®