All of lore.kernel.org
 help / color / mirror / Atom feed
From: james.l.morris@oracle.com (James Morris)
To: linux-security-module@vger.kernel.org
Subject: [PATCH] MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries
Date: Mon, 6 Nov 2017 02:22:10 +1100 (AEDT)	[thread overview]
Message-ID: <alpine.LFD.2.20.1711060221580.3910@localhost> (raw)
In-Reply-To: <1509721716.3416.51.camel@linux.vnet.ibm.com>

On Fri, 3 Nov 2017, Mimi Zohar wrote:

> Hi James,
> 
> With all the changes to MAINTAINERS there's a conflict with the patch
> in my next branch. ?Could you carry this patch?

Applied to:

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


-- 
James Morris
<james.l.morris@oracle.com>

WARNING: multiple messages have this Message-ID (diff)
From: James Morris <james.l.morris@oracle.com>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: James Morris <jmorris@namei.org>,
	linux-security-module <linux-security-module@vger.kernel.org>,
	linux-integrity <linux-integrity@vger.kernel.org>
Subject: Re: [PATCH] MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries
Date: Mon, 6 Nov 2017 02:22:10 +1100 (AEDT)	[thread overview]
Message-ID: <alpine.LFD.2.20.1711060221580.3910@localhost> (raw)
In-Reply-To: <1509721716.3416.51.camel@linux.vnet.ibm.com>

On Fri, 3 Nov 2017, Mimi Zohar wrote:

> Hi James,
> 
> With all the changes to MAINTAINERS there's a conflict with the patch
> in my next branch.  Could you carry this patch?

Applied to:

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


-- 
James Morris
<james.l.morris@oracle.com>

  reply	other threads:[~2017-11-05 15:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-03 15:08 [PATCH] MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries Mimi Zohar
2017-11-03 15:08 ` Mimi Zohar
2017-11-05 15:22 ` James Morris [this message]
2017-11-05 15:22   ` 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.LFD.2.20.1711060221580.3910@localhost \
    --to=james.l.morris@oracle.com \
    --cc=linux-security-module@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.