public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: John Johansen <john.johansen@canonical.com>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org
Subject: Re: [PATCH 13/13] AppArmor: update Maintainer and Documentation/kernel-parameters.txt
Date: Wed, 28 Jul 2010 16:12:49 -0700	[thread overview]
Message-ID: <4C50B971.10807@canonical.com> (raw)
In-Reply-To: <20100728104629.ddba3cc5.randy.dunlap@oracle.com>

On 07/28/2010 10:46 AM, Randy Dunlap wrote:
> On Mon, 26 Jul 2010 19:57:48 -0700 John Johansen wrote:
> 
>> Signed-off-by: John Johansen <john.johansen@canonical.com>
>> ---
>>  Documentation/kernel-parameters.txt |   12 ++++++++++--
>>  MAINTAINERS                         |    8 ++++++++
>>  2 files changed, 18 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
>> index 4ddb58d..b61f89f 100644
>> --- a/Documentation/kernel-parameters.txt
>> +++ b/Documentation/kernel-parameters.txt
>> @@ -93,6 +93,7 @@ parameter is applicable:
>>  			Documentation/scsi/.
>>  	SECURITY Different security models are enabled.
>>  	SELINUX SELinux support is enabled.
>> +	APPARMOR AppArmor support is enabled.
>>  	SERIAL	Serial support is enabled.
>>  	SH	SuperH architecture is enabled.
>>  	SMP	The kernel is an SMP kernel.
>> @@ -254,8 +255,8 @@ and is between 256 and 4096 characters. It is defined in the file
>>  			control method, with respect to putting devices into
>>  			low power states, to be enforced (the ACPI 2.0 ordering
>>  			of _PTS is used by default).
>> -			s4_nonvs prevents the kernel from saving/restoring the
>> -			ACPI NVS memory during hibernation.
>> +			nonvs prevents the kernel from saving/restoring the
>> +			ACPI NVS memory during suspend/hibernation and resume.
>>  			sci_force_enable causes the kernel to set SCI_EN directly
>>  			on resume from S1/S3 (which is against the ACPI spec,
>>  			but some broken systems don't work without it).
> 
> 
> Is that piece supposed to be part of this patch set?
> 
No, I'm not sure how that slipped in.  Thanks catching it.

  reply	other threads:[~2010-07-28 23:12 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-27  2:57 [AppArmor #6 0/13] AppArmor security module John Johansen
2010-07-27  2:57 ` [PATCH 01/13] AppArmor: misc. base functions and defines John Johansen
2010-07-27  2:57 ` [PATCH 02/13] AppArmor: basic auditing infrastructure John Johansen
2010-07-27  2:57 ` [PATCH 03/13] AppArmor: contexts used in attaching policy to system objects John Johansen
2010-07-27  2:57 ` [PATCH 04/13] AppArmor: core policy routines John Johansen
2010-07-27  2:57 ` [PATCH 05/13] AppArmor: dfa match engine John Johansen
2010-07-27  2:57 ` [PATCH 06/13] AppArmor: policy routines for loading and unpacking policy John Johansen
2010-07-27  2:57 ` [PATCH 07/13] AppArmor: userspace interfaces John Johansen
2010-07-27  2:57 ` [PATCH 08/13] AppArmor: file enforcement routines John Johansen
2010-07-27  2:57 ` [PATCH 09/13] AppArmor: mediation of non file objects John Johansen
2010-07-27  2:57 ` [PATCH 10/13] AppArmor: domain functions for domain transition John Johansen
2010-07-27  2:57 ` [PATCH 11/13] AppArmor: LSM interface, and security module initialization John Johansen
2010-07-27  2:57 ` [PATCH 12/13] AppArmor: Enable configuring and building of the AppArmor security module John Johansen
2010-07-27  2:57 ` [PATCH 13/13] AppArmor: update Maintainer and Documentation/kernel-parameters.txt John Johansen
2010-07-28 17:46   ` Randy Dunlap
2010-07-28 23:12     ` John Johansen [this message]
2010-07-28  6:48 ` [AppArmor #6 0/13] AppArmor security module Tetsuo Handa
2010-07-29  2:36   ` Casey Schaufler
2010-07-29 10:44   ` John Johansen
2010-07-31  6:15   ` Pavel Machek
  -- strict thread matches above, loose matches on Subject: below --
2010-07-15  0:43 [AppArmor #5 " John Johansen
2010-07-15  0:43 ` [PATCH 13/13] AppArmor: update Maintainer and Documentation/kernel-parameters.txt John Johansen

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=4C50B971.10807@canonical.com \
    --to=john.johansen@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    /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