Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap...

* 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
  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/<moved_file>   to Documentation/security/<moved_file>.

diff --combined MAINTAINERS
index 572b5b2,ec94742..a6562ba
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -287,35 -287,35 +287,35 @@@ F:      sound/pci/ad1889.
  
  AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD5254
  S:    Supported
  F:    drivers/misc/ad525x_dpot.c
  
  AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD5398
  S:    Supported
  F:    drivers/regulator/ad5398.c
  
  AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7142
  S:    Supported
  F:    drivers/input/misc/ad714x.c
  
  AD7877 TOUCHSCREEN DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7877
  S:    Supported
  F:    drivers/input/touchscreen/ad7877.c
  
  AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7879
  S:    Supported
  F:    drivers/input/touchscreen/ad7879.c
@@@ -341,7 -341,7 +341,7 @@@ F: drivers/net/wireless/adm8211.
  
  ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP5520
  S:    Supported
  F:    drivers/mfd/adp5520.c
@@@ -352,7 -352,7 +352,7 @@@ F: drivers/input/keyboard/adp5520-keys.
  
  ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP5588
  S:    Supported
  F:    drivers/input/keyboard/adp5588-keys.c
@@@ -360,7 -360,7 +360,7 @@@ F: drivers/gpio/adp5588-gpio.
  
  ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP8860
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
@@@ -387,7 -387,7 +387,7 @@@ F: drivers/hwmon/adt7475.
  
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADXL345
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
@@@ -405,8 -405,8 +405,8 @@@ S: Maintaine
  F:    sound/oss/aedsp16.c
  
  AFFS FILE SYSTEM
 -M:    Roman Zippel <zippel@linux-m68k.org>
 -S:    Maintained
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Orphan
  F:    Documentation/filesystems/affs.txt
  F:    fs/affs/
  
@@@ -483,13 -483,6 +483,13 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 +M:    Andreas Herrmann <andreas.herrmann3@amd.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/fam15h_power
 +F:    drivers/hwmon/fam15h_power.c
 +
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  M:    Thomas Dahlmann <dahlmann.thomas@arcor.de>
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
@@@ -533,7 -526,7 +533,7 @@@ S: Maintaine
  F:    drivers/infiniband/hw/amso1100/
  
  ANALOG DEVICES INC ASOC CODEC DRIVERS
 -L:    device-driver-devel@blackfin.uclinux.org
 +L:    device-drivers-devel@blackfin.uclinux.org
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://wiki.analog.com/
  S:    Supported
@@@ -555,11 -548,10 +555,11 @@@ S:      Maintaine
  F:    sound/aoa/
  
  APM DRIVER
 -L:    linux-laptop@vger.kernel.org
 -S:    Orphan
 +M:    Jiri Kosina <jkosina@suse.cz>
 +S:    Odd fixes
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
 +F:    drivers/char/apm-emulation.c
  
  APPLE BCM5974 MULTITOUCH DRIVER
  M:    Henrik Rydberg <rydberg@euromail.se>
@@@ -737,7 -729,7 +737,7 @@@ ARM/EZX SMARTPHONES (A780, A910, A1200
  M:    Daniel Ribeiro <drwyrm@gmail.com>
  M:    Stefan Schmidt <stefan@openezx.org>
  M:    Harald Welte <laforge@openezx.org>
 -L:    openezx-devel@lists.openezx.org (subscribers-only)
 +L:    openezx-devel@lists.openezx.org (moderated for non-subscribers)
  W:    http://www.openezx.org/
  S:    Maintained
  T:    topgit git://git.openezx.org/openezx.git
@@@ -931,8 -923,6 +931,8 @@@ F: drivers/mmc/host/msm_sdcc.
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/platform/msm/
 +F:    drivers/*/pm8???-*
 +F:    include/linux/mfd/pm8xxx/
  T:    git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
  S:    Maintained
  
@@@ -1242,6 -1232,13 +1242,6 @@@ W:     http://wireless.kernel.org/en/users/
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
 -ATHEROS AR9170 WIRELESS DRIVER
 -M:    Christian Lamparter <chunkeey@web.de>
 -L:    linux-wireless@vger.kernel.org
 -W:    http://wireless.kernel.org/en/users/Drivers/ar9170
 -S:    Obsolete
 -F:    drivers/net/wireless/ath/ar9170/
 -
  CARL9170 LINUX COMMUNITY WIRELESS DRIVER
  M:    Christian Lamparter <chunkeey@googlemail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -2043,8 -2040,9 +2043,8 @@@ F:      net/ax25/ax25_timer.
  F:    net/ax25/sysctl_net_ax25.c
  
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 -M:    Tobias Ringstrom <tori@unhappy.mine.nu>
  L:    netdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/networking/dmfe.txt
  F:    drivers/net/tulip/dmfe.c
  
@@@ -2253,10 -2251,10 +2253,10 @@@ F:   drivers/gpu/drm
  F:    include/drm/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Chris Wilson <chris@chris-wilson.co.uk>
 +M:    Keith Packard <keithp@keithp.com>
  L:    intel-gfx@lists.freedesktop.org (subscribers-only)
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2584,13 -2582,6 +2584,13 @@@ S:    Maintaine
  F:    drivers/hwmon/f75375s.c
  F:    include/linux/f75375s.h
  
 +FIREWIRE AUDIO DRIVERS
 +M:    Clemens Ladisch <clemens@ladisch.de>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +T:    git git://git.alsa-project.org/alsa-kernel.git
 +S:    Maintained
 +F:    sound/firewire/
 +
  FIREWIRE SUBSYSTEM
  M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
  L:    linux1394-devel@lists.sourceforge.net
@@@ -2955,8 -2946,8 +2955,8 @@@ F:      drivers/block/cciss
  F:    include/linux/cciss_ioctl.h
  
  HFS FILESYSTEM
 -M:    Roman Zippel <zippel@linux-m68k.org>
 -S:    Maintained
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Orphan
  F:    Documentation/filesystems/hfs.txt
  F:    fs/hfs/
  
@@@ -3372,12 -3363,6 +3372,12 @@@ F:    Documentation/wimax/README.i2400
  F:    drivers/net/wimax/i2400m/
  F:    include/linux/wimax/i2400m.h
  
 +INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 +M:    Stanislaw Gruszka <sgruszka@redhat.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/wireless/iwlegacy/
 +
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
  M:    Intel Linux Wireless <ilw@linux.intel.com>
@@@ -3581,16 -3566,9 +3581,16 @@@ M:    Andrew Morton <akpm@linux-foundation
  M:    Jan Kara <jack@suse.cz>
  L:    linux-ext4@vger.kernel.org
  S:    Maintained
 -F:    fs/jbd*/
 -F:    include/linux/ext*jbd*.h
 -F:    include/linux/jbd*.h
 +F:    fs/jbd/
 +F:    include/linux/ext3_jbd.h
 +F:    include/linux/jbd.h
 +
 +JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
 +M:    "Theodore Ts'o" <tytso@mit.edu>
 +L:    linux-ext4@vger.kernel.org
 +S:    Maintained
 +F:    fs/jbd2/
 +F:    include/linux/jbd2.h
  
  JSM Neo PCI based serial card
  M:    Breno Leitao <leitao@linux.vnet.ibm.com>
@@@ -3613,9 -3591,10 +3613,9 @@@ F:     Documentation/hwmon/k8tem
  F:    drivers/hwmon/k8temp.c
  
  KCONFIG
 -M:    Roman Zippel <zippel@linux-m68k.org>
 +M:    Michal Marek <mmarek@suse.cz>
  L:    linux-kbuild@vger.kernel.org
 -Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
  
@@@ -3726,7 -3705,7 +3726,7 @@@ KEYS/KEYRINGS
  M:    David Howells <dhowells@redhat.com>
  L:    keyrings@linux-nfs.org
  S:    Maintained
- F:    Documentation/keys.txt
+ F:    Documentation/security/keys.txt
  F:    include/linux/key.h
  F:    include/linux/key-type.h
  F:    include/keys/
@@@ -3738,7 -3717,7 +3738,7 @@@ M:      Mimi Zohar <zohar@us.ibm.com
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@linux-nfs.org
  S:    Supported
- F:    Documentation/keys-trusted-encrypted.txt
+ F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/trusted-type.h
  F:    security/keys/trusted.c
  F:    security/keys/trusted.h
@@@ -3749,7 -3728,7 +3749,7 @@@ M:      David Safford <safford@watson.ibm.co
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@linux-nfs.org
  S:    Supported
- F:    Documentation/keys-trusted-encrypted.txt
+ F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/encrypted-type.h
  F:    security/keys/encrypted.c
  F:    security/keys/encrypted.h
@@@ -3919,6 -3898,7 +3919,6 @@@ F:      drivers/*/*/*pasemi
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <chrisw@sous-sol.org>
  L:    linux-security-module@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
  S:    Supported
  
  LIS3LV02D ACCELEROMETER DRIVER
@@@ -4021,6 -4001,7 +4021,6 @@@ F:      arch/m32r
  
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <geert@linux-m68k.org>
 -M:    Roman Zippel <zippel@linux-m68k.org>
  L:    linux-m68k@lists.linux-m68k.org
  W:    http://www.linux-m68k.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
@@@ -4154,7 -4135,6 +4154,7 @@@ M:      KAMEZAWA Hiroyuki <kamezawa.hiroyu@j
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/memcontrol.c
 +F:    mm/page_cgroup.c
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
@@@ -4274,7 -4254,7 +4274,7 @@@ F:      include/linux/isicom.
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
  M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
 -T:    git git://gitorious.org/usb/usb.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/musb/
  
@@@ -4291,13 -4271,6 +4291,13 @@@ M:    Tim Hockin <thockin@hockin.org
  S:    Maintained
  F:    drivers/net/natsemi.c
  
 +NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
 +M:    Daniel Mack <zonque@gmail.com>
 +S:    Maintained
 +L:    alsa-devel@alsa-project.org
 +W:    http://www.native-instruments.com
 +F:    sound/usb/caiaq/
 +
  NCP FILESYSTEM
  M:    Petr Vandrovec <petr@vandrovec.name>
  S:    Odd Fixes
@@@ -4413,7 -4386,6 +4413,7 @@@ S:      Maintaine
  F:    net/ipv4/
  F:    net/ipv6/
  F:    include/net/ip*
 +F:    arch/x86/net/*
  
  NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
  M:    Paul Moore <paul.moore@hp.com>
@@@ -4609,7 -4581,6 +4609,7 @@@ M:      Felipe Balbi <balbi@ti.com
  M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/*/*omap*
  F:    arch/arm/*omap*/usb*
@@@ -5461,7 -5432,6 +5461,7 @@@ F:      include/linux/timex.
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
 +F:    drivers/clocksource
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
@@@ -5613,11 -5583,10 +5613,11 @@@ M:   James Morris <jmorris@namei.org
  M:    Eric Paris <eparis@parisplace.org>
  L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
  W:    http://selinuxproject.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 +T:    git git://git.infradead.org/users/eparis/selinux.git
  S:    Supported
  F:    include/linux/selinux*
  F:    security/selinux/
 +F:    scripts/selinux/
  
  APPARMOR SECURITY MODULE
  M:    John Johansen <john.johansen@canonical.com>
@@@ -5643,9 -5612,9 +5643,9 @@@ F:      include/linux/ata.
  F:    include/linux/libata.h
  
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 -M:    Jayamohan Kallickal <jayamohank@serverengines.com>
 +M:    Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.serverengines.com
 +W:    http://www.emulex.com
  S:    Supported
  F:    drivers/scsi/be2iscsi/
  
@@@ -5863,13 -5832,6 +5863,13 @@@ S:    Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 +M:    Rafał Miłecki <zajec5@gmail.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/bcma/
 +F:    include/linux/bcma/
 +
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <malattia@linux.it>
  L:    platform-driver-x86@vger.kernel.org
@@@ -5899,7 -5861,7 +5899,7 @@@ F:      include/sound
  F:    sound/
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
 -M:    Liam Girdwood <lrg@slimlogic.co.uk>
 +M:    Liam Girdwood <lrg@ti.com>
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -6008,7 -5970,7 +6008,7 @@@ F:      Documentation/filesystems/spufs.tx
  F:    arch/powerpc/platforms/cell/spufs/
  
  SQUASHFS FILE SYSTEM
 -M:    Phillip Lougher <phillip@lougher.demon.co.uk>
 +M:    Phillip Lougher <phillip@squashfs.org.uk>
  L:    squashfs-devel@lists.sourceforge.net (subscribers-only)
  W:    http://squashfs.org.uk
  S:    Maintained
@@@ -6150,7 -6112,7 +6150,7 @@@ F:      drivers/mmc/host/tifm_sd.
  F:    include/linux/tifm.h
  
  TI TWL4030 SERIES SOC CODEC DRIVER
 -M:    Peter Ujfalusi <peter.ujfalusi@nokia.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
@@@ -6253,7 -6215,6 +6253,7 @@@ TRIVIAL PATCHE
  M:    Jiri Kosina <trivial@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
  S:    Maintained
 +K:    ^Subject:.*(?i)trivial
  
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@suse.de>
@@@ -6795,7 -6756,7 +6795,7 @@@ F:      drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 -M:    Liam Girdwood <lrg@slimlogic.co.uk>
 +M:    Liam Girdwood <lrg@ti.com>
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
@@@ -6817,13 -6778,6 +6817,13 @@@ L:    lm-sensors@lm-sensors.or
  S:    Maintained
  F:    drivers/hwmon/vt8231.c
  
 +VUB300 USB to SDIO/SD/MMC bridge chip
 +M:    Tony Olech <tony.olech@elandigitalsystems.com>
 +L:    linux-mmc@vger.kernel.org
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +F:    drivers/mmc/host/vub300.c
 +
  W1 DALLAS'S 1-WIRE BUS
  M:    Evgeniy Polyakov <johnpol@2ka.mipt.ru>
  S:    Maintained

diff --combined include/linux/key.h
index ef19b99,303982a..6ea4eeb
--- 1/include/linux/key.h
--- 2/include/linux/key.h
+++ b/include/linux/key.h
@@@ -9,7 -9,7 +9,7 @@@
   * 2 of the License, or (at your option) any later version.
   *
   *
-  * See Documentation/keys.txt for information on keys/keyrings.
+  * See Documentation/security/keys.txt for information on keys/keyrings.
   */
  
  #ifndef _LINUX_KEY_H
@@@ -276,19 -276,6 +276,19 @@@ static inline key_serial_t key_serial(s
        return key ? key->serial : 0;
  }
  
 +/**
 + * key_is_instantiated - Determine if a key has been positively instantiated
 + * @key: The key to check.
 + *
 + * Return true if the specified key has been positively instantiated, false
 + * otherwise.
 + */
 +static inline bool key_is_instantiated(const struct key *key)
 +{
 +      return test_bit(KEY_FLAG_INSTANTIATED, &key->flags) &&
 +              !test_bit(KEY_FLAG_NEGATIVE, &key->flags);
 +}
 +
  #define rcu_dereference_key(KEY)                                      \
        (rcu_dereference_protected((KEY)->payload.rcudata,              \
                                   rwsem_is_locked(&((struct key *)(KEY))->sem)))

diff --combined kernel/cred.c
index e12c8af,004e367..174fa84
--- 1/kernel/cred.c
--- 2/kernel/cred.c
+++ b/kernel/cred.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Task credentials management - see Documentation/credentials.txt
+ /* Task credentials management - see Documentation/security/credentials.txt
   *
   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
   * Written by David Howells (dhowells@redhat.com)
@@@ -49,10 -49,10 +49,10 @@@ struct cred init_cred = 
        .magic                  = CRED_MAGIC,
  #endif
        .securebits             = SECUREBITS_DEFAULT,
 -      .cap_inheritable        = CAP_INIT_INH_SET,
 +      .cap_inheritable        = CAP_EMPTY_SET,
        .cap_permitted          = CAP_FULL_SET,
 -      .cap_effective          = CAP_INIT_EFF_SET,
 -      .cap_bset               = CAP_INIT_BSET,
 +      .cap_effective          = CAP_FULL_SET,
 +      .cap_bset               = CAP_FULL_SET,
        .user                   = INIT_USER,
        .user_ns                = &init_user_ns,
        .group_info             = &init_groups,

diff --combined security/keys/request_key.c
index b18a717,d41cc15..d31862e
--- 1/security/keys/request_key.c
--- 2/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@@ -8,7 -8,7 +8,7 @@@
   * as published by the Free Software Foundation; either version
   * 2 of the License, or (at your option) any later version.
   *
-  * See Documentation/keys-request-key.txt
+  * See Documentation/security/keys-request-key.txt
   */
  
  #include <linux/module.h>
@@@ -530,7 -530,8 +530,7 @@@ struct key *request_key_and_link(struc
               dest_keyring, flags);
  
        /* search all the process keyrings for a key */
 -      key_ref = search_process_keyrings(type, description, type->match,
 -                                        cred);
 +      key_ref = search_process_keyrings(type, description, type->match, cred);
  
        if (!IS_ERR(key_ref)) {
                key = key_ref_to_ptr(key_ref);

diff --combined security/keys/request_key_auth.c
index f6337c9,3c0cfde..6cff375
--- 1/security/keys/request_key_auth.c
--- 2/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@@ -8,7 -8,7 +8,7 @@@
   * as published by the Free Software Foundation; either version
   * 2 of the License, or (at your option) any later version.
   *
-  * See Documentation/keys-request-key.txt
+  * See Documentation/security/keys-request-key.txt
   */
  
  #include <linux/module.h>
@@@ -59,8 -59,7 +59,8 @@@ static void request_key_auth_describe(c
  
        seq_puts(m, "key:");
        seq_puts(m, key->description);
 -      seq_printf(m, " pid:%d ci:%zu", rka->pid, rka->callout_len);
 +      if (key_is_instantiated(key))
 +              seq_printf(m, " pid:%d ci:%zu", rka->pid, rka->callout_len);
  }
  
  /*