Commit 65d2918e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'cleanups' 

Merge cleanups requested by Linus.

* cleanups: (3 commits)
  pnfs: Refactor the *_layout_mark_request_commit to use pnfs_layout_mark_request_commit
  nfs: Can call nfs_clear_page_commit() instead
  nfs: Provide and use helper functions for marking a page as unstable
parents bf40e556 338d00cf

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ Juha Yrjola <juha.yrjola@nokia.com> 
Juha Yrjola <juha.yrjola@solidboot.com>

Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Documentation/00-INDEX

+10 −18
Original line number Diff line number Diff line
@@ -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,22 +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.

locking/

	- directory with info about kernel locking primitives

lockstat.txt

	- info on collecting statistics on locks (and contention).

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
@@ -327,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/
@@ -395,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/
@@ -425,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
@@ -483,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/stable/sysfs-class-tpm

+11 −11
Original line number Diff line number Diff line 
What:		/sys/class/misc/tpmX/device/

What:		/sys/class/tpm/tpmX/device/

Date:		April 2005

KernelVersion:	2.6.12

Contact:	tpmdd-devel@lists.sf.net
@@ -6,7 +6,7 @@ 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:	tpmdd-devel@lists.sf.net
@@ -18,7 +18,7 @@ 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:	tpmdd-devel@lists.sf.net
@@ -26,7 +26,7 @@ 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:	tpmdd-devel@lists.sf.net
@@ -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:	tpmdd-devel@lists.sf.net
@@ -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:	tpmdd-devel@lists.sf.net
@@ -75,7 +75,7 @@ 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:	tpmdd-devel@lists.sf.net
@@ -83,7 +83,7 @@ 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:	tpmdd-devel@lists.sf.net
@@ -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:	tpmdd-devel@lists.sf.net
@@ -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:	tpmdd-devel@lists.sf.net
@@ -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:	tpmdd-devel@lists.sf.net

Documentation/ABI/testing/sysfs-bus-amba

0 → 100644
+20 −0
Original line number Diff line number Diff line 
What:		/sys/bus/amba/devices/.../driver_override

Date:		September 2014

Contact:	Antonios Motakis <a.motakis@virtualopensystems.com>

Description:

		This file allows the driver for a device to be specified which

		will override standard OF, ACPI, ID table, and name matching.

		When specified, only a driver with a name matching the value

		written to driver_override will have an opportunity to bind to

		the device. The override is specified by writing a string to the

		driver_override file (echo vfio-amba > driver_override)	and may

		be cleared with an empty string (echo > driver_override).

		This returns the device to standard matching rules binding.

		Writing to driver_override does not automatically unbind the

		device from its current driver or make any attempt to

		automatically load the specified driver. If no driver with a

		matching name is currently loaded in the kernel, the device will

		not bind to any driver. This also allows devices to opt-out of

		driver binding using a driver_override name such as "none".

		Only a single driver may be specified in the override, there is

		no support for parsing delimiters.

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+6 −0
Original line number Diff line number Diff line
@@ -52,12 +52,18 @@ Description: Per-pmu performance monitoring events specific to the running syste 
			event=0x2abc

			event=0x423,inv,cmask=0x3

			domain=0x1,offset=0x8,starting_index=0xffff

			domain=0x1,offset=0x8,core=?



		Each of the assignments indicates a value to be assigned to a

		particular set of bits (as defined by the format file

		corresponding to the <term>) in the perf_event structure passed

		to the perf_open syscall.



		In the case of the last example, a value replacing "?" would

		need to be provided by the user selecting the particular event.

		This is referred to as "event parameterization". Event

		parameters have the format 'param=?'.



What: /sys/bus/event_source/devices/<pmu>/events/<event>.unit

Date: 2014/02/24

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>