From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp1040.oracle.com ([156.151.31.81]:40787 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750AbdKEPWR (ORCPT ); Sun, 5 Nov 2017 10:22:17 -0500 Date: Mon, 6 Nov 2017 02:22:10 +1100 (AEDT) From: James Morris To: Mimi Zohar cc: James Morris , linux-security-module , linux-integrity Subject: Re: [PATCH] MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries In-Reply-To: <1509721716.3416.51.camel@linux.vnet.ibm.com> Message-ID: References: <1509721716.3416.51.camel@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="8323328-364258975-1509895331=:3910" Sender: linux-integrity-owner@vger.kernel.org List-ID: 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: james.l.morris@oracle.com (James Morris) Date: Mon, 6 Nov 2017 02:22:10 +1100 (AEDT) Subject: [PATCH] MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries In-Reply-To: <1509721716.3416.51.camel@linux.vnet.ibm.com> References: <1509721716.3416.51.camel@linux.vnet.ibm.com> Message-ID: To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org 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