Merge commit 'v3.7-rc1' into stable/for-linus-3.7

* commit 'v3.7-rc1': (10892 commits)
  Linux 3.7-rc1
  x86, boot: Explicitly include autoconf.h for hostprogs
  perf: Fix UAPI fallout
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h
  perf: Handle new rbtree implementation
  procfs: don't need a PATH_MAX allocation to hold a string representation of an int
  vfs: embed struct filename inside of names_cache allocation if possible
  audit: make audit_inode take struct filename
  vfs: make path_openat take a struct filename pointer
  vfs: turn do_path_lookup into wrapper around struct filename variant
  audit: allow audit code to satisfy getname requests from its names_list
  vfs: define struct filename and have getname() return it
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids
  ...

1 files changed, 0 insertions, 60 deletions

diff --git a/include/linux/keyctl.h b/include/linux/keyctl.h
deleted file mode 100644
index c9b7f4faf97a..000000000000
--- a/include/linux/keyctl.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* keyctl.h: keyctl command IDs
- *
- * Copyright (C) 2004, 2008 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _LINUX_KEYCTL_H
-#define _LINUX_KEYCTL_H
-
-/* special process keyring shortcut IDs */
-#define KEY_SPEC_THREAD_KEYRING         -1      /* - key ID for thread-specific keyring */
-#define KEY_SPEC_PROCESS_KEYRING        -2      /* - key ID for process-specific keyring */
-#define KEY_SPEC_SESSION_KEYRING        -3      /* - key ID for session-specific keyring */
-#define KEY_SPEC_USER_KEYRING           -4      /* - key ID for UID-specific keyring */
-#define KEY_SPEC_USER_SESSION_KEYRING   -5      /* - key ID for UID-session keyring */
-#define KEY_SPEC_GROUP_KEYRING          -6      /* - key ID for GID-specific keyring */
-#define KEY_SPEC_REQKEY_AUTH_KEY        -7      /* - key ID for assumed request_key auth key */
-#define KEY_SPEC_REQUESTOR_KEYRING      -8      /* - key ID for request_key() dest keyring */
-
-/* request-key default keyrings */
-#define KEY_REQKEY_DEFL_NO_CHANGE               -1
-#define KEY_REQKEY_DEFL_DEFAULT                 0
-#define KEY_REQKEY_DEFL_THREAD_KEYRING          1
-#define KEY_REQKEY_DEFL_PROCESS_KEYRING         2
-#define KEY_REQKEY_DEFL_SESSION_KEYRING         3
-#define KEY_REQKEY_DEFL_USER_KEYRING            4
-#define KEY_REQKEY_DEFL_USER_SESSION_KEYRING    5
-#define KEY_REQKEY_DEFL_GROUP_KEYRING           6
-#define KEY_REQKEY_DEFL_REQUESTOR_KEYRING       7
-
-/* keyctl commands */
-#define KEYCTL_GET_KEYRING_ID           0       /* ask for a keyring's ID */
-#define KEYCTL_JOIN_SESSION_KEYRING     1       /* join or start named session keyring */
-#define KEYCTL_UPDATE                   2       /* update a key */
-#define KEYCTL_REVOKE                   3       /* revoke a key */
-#define KEYCTL_CHOWN                    4       /* set ownership of a key */
-#define KEYCTL_SETPERM                  5       /* set perms on a key */
-#define KEYCTL_DESCRIBE                 6       /* describe a key */
-#define KEYCTL_CLEAR                    7       /* clear contents of a keyring */
-#define KEYCTL_LINK                     8       /* link a key into a keyring */
-#define KEYCTL_UNLINK                   9       /* unlink a key from a keyring */
-#define KEYCTL_SEARCH                   10      /* search for a key in a keyring */
-#define KEYCTL_READ                     11      /* read a key or keyring's contents */
-#define KEYCTL_INSTANTIATE              12      /* instantiate a partially constructed key */
-#define KEYCTL_NEGATE                   13      /* negate a partially constructed key */
-#define KEYCTL_SET_REQKEY_KEYRING       14      /* set default request-key keyring */
-#define KEYCTL_SET_TIMEOUT              15      /* set key timeout */
-#define KEYCTL_ASSUME_AUTHORITY         16      /* assume request_key() authorisation */
-#define KEYCTL_GET_SECURITY             17      /* get key security label */
-#define KEYCTL_SESSION_TO_PARENT        18      /* apply session keyring to parent process */
-#define KEYCTL_REJECT                   19      /* reject a partially constructed key */
-#define KEYCTL_INSTANTIATE_IOV          20      /* instantiate a partially constructed key */
-#define KEYCTL_INVALIDATE               21      /* invalidate a key */
-
-#endif /*  _LINUX_KEYCTL_H */