Merge pull request #6 from torvalds/master

Merge Torvalds/linux:master

.gitignore

@@ -43,6 +43,7 @@ Module.symvers
 /TAGS
 /linux
 /vmlinux
+/vmlinux-gdb.py
 /vmlinuz
 /System.map
 /Module.markers
@@ -52,6 +53,11 @@ Module.symvers
 #
 /debian/
 
+#
+# tar directory (make tar*-pkg)
+#
+/tar-install/
+
 #
 # git files that we don't want to ignore even it they are dot-files
 #
@@ -96,3 +102,6 @@ x509.genkey
 
 # Kconfig presets
 all.config
+
+# Kdevelop4
+*.kdev4

.mailmap

@@ -17,7 +17,7 @@ Aleksey Gorelov <[email protected]>
 Al Viro <[email protected]>
 Al Viro <[email protected]>
 Andreas Herrmann <[email protected]>
-Andrew Morton <akpm@osdl.org>
+Andrew Morton <akpm@linux-foundation.org>
 Andrew Vasquez <[email protected]>
 Andy Adamson <[email protected]>
 Archit Taneja <[email protected]>
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <[email protected]>
 Greg Kroah-Hartman <[email protected]>
 Henk Vergonet <[email protected]>
 Henrik Kretzschmar <[email protected]>
+Henrik Rydberg <[email protected]>
 Herbert Xu <[email protected]>
 Jacob Shin <[email protected]>
 James Bottomley <jejb@mulgrave.(none)>
@@ -72,6 +73,7 @@ Juha Yrjola <[email protected]>
 Juha Yrjola <[email protected]>
 Kay Sievers <[email protected]>
 Kenneth W Chen <[email protected]>
+Konstantin Khlebnikov <[email protected]> <[email protected]>
 Koushik <[email protected]>
 Kuninori Morimoto <[email protected]>
 Leonid I Ananiev <[email protected]>
@@ -102,6 +104,8 @@ Rudolf Marek <[email protected]>
 Rui Saraiva <[email protected]>
 Sachin P Sant <[email protected]>
 Sam Ravnborg <[email protected]>
+Santosh Shilimkar <[email protected]>
+Santosh Shilimkar <[email protected]>
 Sascha Hauer <[email protected]>
 S.Çağlar Onur <[email protected]>
 Shiraz Hashim <[email protected]> <[email protected]>

CREDITS

@@ -187,6 +187,10 @@ N: Krishna Balasubramanian
 E: [email protected]
 D: Wrote SYS V IPC (part of standard kernel since 0.99.10)
 
+N: Chris Ball
+E: [email protected]
+D: Former maintainer of the MMC/SD/SDIO subsystem.
+
 N: Dario Ballabio
 E: [email protected]
 E: [email protected]
@@ -1197,6 +1201,13 @@ S: R. Tocantins, 89 - Cristo Rei
 S: 80050-430 - Curitiba - Paraná
 S: Brazil
 
+N: Oded Gabbay
+E: [email protected]
+D: AMD KFD maintainer
+S: 12 Shraga Raphaeli
+S: Petah-Tikva, 4906418
+S: Israel
+
 N: Kumar Gala
 E: [email protected]
 D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support
@@ -1727,14 +1738,14 @@ S: Chapel Hill, North Carolina 27514-4818
 S: USA
 
 N: Dave Jones
-E: davej@redhat.com
+E: davej@codemonkey.org.uk
 W: http://www.codemonkey.org.uk
 D: Assorted VIA x86 support.
 D: 2.5 AGPGART overhaul.
 D: CPUFREQ maintenance.
-D: Fedora kernel maintenance.
+D: Fedora kernel maintenance (2003-2014).
+D: 'Trinity' and similar fuzz testing work.
 D: Misc/Other.
-S: 314 Littleton Rd, Westford, MA 01886, USA
 
 N: Martin Josfsson
 E: [email protected]

Documentation/00-INDEX

@@ -29,8 +29,6 @@ DMA-ISA-LPC.txt
  - How to do DMA with ISA (and LPC) devices.
 DMA-attributes.txt
  - listing of the various possible attributes a DMA region can have
-dmatest.txt
- - how to compile, configure and use the dmatest system.
 DocBook/
  - directory with DocBook templates etc. for kernel documentation.
 EDID/
@@ -163,8 +161,6 @@ digsig.txt
  -info on the Digital Signature Verification API
 dma-buf-sharing.txt
  - the DMA Buffer Sharing API Guide
-dmaengine.txt
- -the DMA Engine API Guide
 dontdiff
  - file containing a list of files that should never be diff'ed.
 driver-model/
@@ -209,6 +205,8 @@ hid/
  - directory with information on human interface devices
 highuid.txt
  - notes on the change from 16 bit to 32 bit user/group IDs.
+hsi.txt
+ - HSI subsystem overview.
 hwspinlock.txt
  - hardware spinlock provides hardware assistance for synchronization
 timers/
@@ -277,6 +275,8 @@ kprobes.txt
  - documents the kernel probes debugging feature.
 kref.txt
  - docs on adding reference counters (krefs) to kernel objects.
+kselftest.txt
+ - small unittests for (some) individual codepaths in the kernel.
 laptops/
  - directory with laptop related info and laptop driver documentation.
 ldm.txt
@@ -285,20 +285,22 @@ leds/
  - directory with info about LED handling under Linux.
 local_ops.txt
  - semantics and behavior of local atomic operations.
-lockdep-design.txt
- - documentation on the runtime locking correctness validator.
-lockstat.txt
- - info on collecting statistics on locks (and contention).
+locking/
+ - directory with info about kernel locking primitives
 lockup-watchdogs.txt
  - info on soft and hard lockup detectors (aka nmi_watchdog).
 logo.gif
  - full colour GIF image of Linux logo (penguin - Tux).
 logo.txt
  - info on creator of above logo & site to get additional images from.
+lzo.txt
+ - kernel LZO decompressor input formats
 m68k/
  - directory with info about Linux on Motorola 68k architecture.
 magic-number.txt
  - list of magic numbers used to mark/protect kernel data structures.
+mailbox.txt
+ - How to write drivers for the common mailbox framework (IPC).
 md.txt
  - info on boot arguments for the multiple devices driver.
 media-framework.txt
@@ -325,8 +327,6 @@ mtd/
  - directory with info about memory technology devices (flash)
 mono.txt
  - how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
-mutex-design.txt
- - info on the generic mutex subsystem.
 namespaces/
  - directory with various information about namespaces
 netlabel/
@@ -393,10 +393,6 @@ robust-futexes.txt
  - a description of what robust futexes are.
 rpmsg.txt
  - info on the Remote Processor Messaging (rpmsg) Framework
-rt-mutex-design.txt
- - description of the RealTime mutex implementation design.
-rt-mutex.txt
- - desc. of RT-mutex subsystem with PI (Priority Inheritance) support.
 rtc.txt
  - notes on how to use the Real Time Clock (aka CMOS clock) driver.
 s390/
@@ -423,8 +419,6 @@ sparse.txt
  - info on how to obtain and use the sparse tool for typechecking.
 spi/
  - overview of Linux kernel Serial Peripheral Interface (SPI) support.
-spinlocks.txt
- - info on using spinlocks to provide exclusive access in kernel.
 stable_api_nonsense.txt
  - info on why the kernel does not have a stable in-kernel api or abi.
 stable_kernel_rules.txt
@@ -481,10 +475,10 @@ wimax/
  - directory with info about Intel Wireless Wimax Connections
 workqueue.txt
  - information on the Concurrency Managed Workqueue implementation
-ww-mutex-design.txt
- - Intro to Mutex wait/would deadlock handling.s
 x86/x86_64/
  - directory with info on Linux support for AMD x86-64 (Hammer) machines.
+xillybus.txt
+ - Overview and basic ui of xillybus driver
 xtensa/
  - directory with documents relating to arch/xtensa port/implementation
 xz.txt

Documentation/ABI/removed/net_dma

@@ -0,0 +1,8 @@
+What: tcp_dma_copybreak sysctl
+Date: Removed in kernel v3.13
+Contact: Dan Williams <[email protected]>
+Description:
+ Formerly the lower limit, in bytes, of the size of socket reads
+ that will be offloaded to a DMA copy engine. Removed due to
+ coherency issues of the cpu potentially touching the buffers
+ while dma is in flight.

Documentation/ABI/stable/sysfs-bus-usb

@@ -32,10 +32,9 @@ Date: January 2008
 KernelVersion: 2.6.25
 Contact: Sarah Sharp <[email protected]>
 Description:
- If CONFIG_PM_RUNTIME is enabled then this file
- is present. When read, it returns the total time (in msec)
- that the USB device has been connected to the machine. This
- file is read-only.
+ If CONFIG_PM is enabled, then this file is present. When read,
+ it returns the total time (in msec) that the USB device has been
+ connected to the machine. This file is read-only.
 Users:
  PowerTOP <[email protected]>
  https://01.org/powertop/
@@ -45,10 +44,9 @@ Date: January 2008
 KernelVersion: 2.6.25
 Contact: Sarah Sharp <[email protected]>
 Description:
- If CONFIG_PM_RUNTIME is enabled then this file
- is present. When read, it returns the total time (in msec)
- that the USB device has been active, i.e. not in a suspended
- state. This file is read-only.
+ If CONFIG_PM is enabled, then this file is present. When read,
+ it returns the total time (in msec) that the USB device has been
+ active, i.e. not in a suspended state. This file is read-only.
 
  Tools can use this file and the connected_duration file to
  compute the percentage of time that a device has been active.

Documentation/ABI/stable/sysfs-class-tpm

@@ -1,12 +1,12 @@
-What: /sys/class/misc/tpmX/device/
+What: /sys/class/tpm/tpmX/device/
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: [email protected]
 Description: The device/ directory under a specific TPM instance exposes
  the properties of that TPM chip
 
 
-What: /sys/class/misc/tpmX/device/active
+What: /sys/class/tpm/tpmX/device/active
 Date: April 2006
 KernelVersion: 2.6.17
 Contact: [email protected]
@@ -18,15 +18,15 @@ Description: The "active" property prints a '1' if the TPM chip is accepting
  section 17 for more information on which commands are
  available.
 
-What: /sys/class/misc/tpmX/device/cancel
+What: /sys/class/tpm/tpmX/device/cancel
 Date: June 2005
 KernelVersion: 2.6.13
 Contact: [email protected]
 Description: The "cancel" property allows you to cancel the currently
  pending TPM command. Writing any value to cancel will call the
  TPM vendor specific cancel operation.
 
-What: /sys/class/misc/tpmX/device/caps
+What: /sys/class/tpm/tpmX/device/caps
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: [email protected]
@@ -43,7 +43,7 @@ Description: The "caps" property contains TPM manufacturer and version info.
  the chip supports. Firmware version is that of the chip and
  is manufacturer specific.
 
-What: /sys/class/misc/tpmX/device/durations
+What: /sys/class/tpm/tpmX/device/durations
 Date: March 2011
 KernelVersion: 3.1
 Contact: [email protected]
@@ -66,7 +66,7 @@ Description: The "durations" property shows the 3 vendor-specific values
  scaled to be displayed in usecs. In this case "[adjusted]"
  will be displayed in place of "[original]".
 
-What: /sys/class/misc/tpmX/device/enabled
+What: /sys/class/tpm/tpmX/device/enabled
 Date: April 2006
 KernelVersion: 2.6.17
 Contact: [email protected]
@@ -75,15 +75,15 @@ Description: The "enabled" property prints a '1' if the TPM chip is enabled,
  may be visible but produce a '0' after some operation that
  disables the TPM.
 
-What: /sys/class/misc/tpmX/device/owned
+What: /sys/class/tpm/tpmX/device/owned
 Date: April 2006
 KernelVersion: 2.6.17
 Contact: [email protected]
 Description: The "owned" property produces a '1' if the TPM_TakeOwnership
  ordinal has been executed successfully in the chip. A '0'
  indicates that ownership hasn't been taken.
 
-What: /sys/class/misc/tpmX/device/pcrs
+What: /sys/class/tpm/tpmX/device/pcrs
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: [email protected]
@@ -106,7 +106,7 @@ Description: The "pcrs" property will dump the current value of all Platform
  1.2 chips, PCRs represent SHA-1 hashes, which are 20 bytes
  long. Use the "caps" property to determine TPM version.
 
-What: /sys/class/misc/tpmX/device/pubek
+What: /sys/class/tpm/tpmX/device/pubek
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: [email protected]
@@ -158,7 +158,7 @@ Description: The "pubek" property will return the TPM's public endorsement
  Modulus Length: 256 (bytes)
  Modulus: The 256 byte Endorsement Key modulus
 
-What: /sys/class/misc/tpmX/device/temp_deactivated
+What: /sys/class/tpm/tpmX/device/temp_deactivated
 Date: April 2006
 KernelVersion: 2.6.17
 Contact: [email protected]
@@ -167,7 +167,7 @@ Description: The "temp_deactivated" property returns a '1' if the chip has
  cycle. Whether a warm boot (reboot) will clear a TPM chip
  from a temp_deactivated state is platform specific.
 
-What: /sys/class/misc/tpmX/device/timeouts
+What: /sys/class/tpm/tpmX/device/timeouts
 Date: March 2011
 KernelVersion: 3.1
 Contact: [email protected]