Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754Ab1E0RMu (ORCPT ); Fri, 27 May 2011 13:12:50 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:44101 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751353Ab1E0RMs (ORCPT ); Fri, 27 May 2011 13:12:48 -0400 Date: Fri, 27 May 2011 10:12:04 -0700 From: Randy Dunlap To: lkml Cc: torvalds Subject: [GIT PULL] Documentation: add Documentation/security/ and move files there Message-Id: <20110527101204.2ca7eda0.randy.dunlap@oracle.com> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090205.4DDFDB6E.00FF:SCFMA922111,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2908 Lines: 62 Linus, Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git docs-move for these changes: commit d410fa4ef99112386de5f218dd7df7b4fca910b4 Author: Randy Dunlap Date: Thu May 19 15:59:38 2011 -0700 Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/ to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/ to Documentation/security/. Documentation/00-INDEX | 6 ++---- Documentation/filesystems/nfs/idmapper.txt | 4 ++-- Documentation/networking/dns_resolver.txt | 4 ++-- Documentation/security/00-INDEX | 18 ++++++++++++++++++ Documentation/{ => security}/SELinux.txt | 0 Documentation/{ => security}/Smack.txt | 0 Documentation/{ => security}/apparmor.txt | 0 Documentation/{ => security}/credentials.txt | 2 +- Documentation/{ => security}/keys-request-key.txt | 4 ++-- .../{ => security}/keys-trusted-encrypted.txt | 0 Documentation/{ => security}/keys.txt | 4 ++-- Documentation/{ => security}/tomoyo.txt | 0 MAINTAINERS | 6 +++--- include/linux/cred.h | 2 +- include/linux/key.h | 2 +- kernel/cred.c | 2 +- scripts/selinux/README | 2 +- security/apparmor/match.c | 2 +- security/apparmor/policy_unpack.c | 4 ++-- security/keys/encrypted.c | 2 +- security/keys/request_key.c | 2 +- security/keys/request_key_auth.c | 2 +- security/keys/trusted.c | 2 +- 23 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 Documentation/security/00-INDEX rename Documentation/{ => security}/SELinux.txt (100%) rename Documentation/{ => security}/Smack.txt (100%) rename Documentation/{ => security}/apparmor.txt (100%) rename Documentation/{ => security}/credentials.txt (99%) rename Documentation/{ => security}/keys-request-key.txt (98%) rename Documentation/{ => security}/keys-trusted-encrypted.txt (100%) rename Documentation/{ => security}/keys.txt (99%) rename Documentation/{ => security}/tomoyo.txt (100%) --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/