Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee2c25ef authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

Merge branch 'master' into queue 



* master: (15791 commits)
  Linux 3.9-rc1
  btrfs/raid56: Add missing #include <linux/vmalloc.h>
  fix compat_sys_rt_sigprocmask()
  SUNRPC: One line comment fix
  ext4: enable quotas before orphan cleanup
  ext4: don't allow quota mount options when quota feature enabled
  ext4: fix a warning from sparse check for ext4_dir_llseek
  ext4: convert number of blocks to clusters properly
  ext4: fix possible memory leak in ext4_remount()
  jbd2: fix ERR_PTR dereference in jbd2__journal_start
  metag: Provide dma_get_sgtable()
  metag: prom.h: remove declaration of metag_dt_memblock_reserve()
  metag: copy devicetree to non-init memory
  metag: cleanup metag_ksyms.c includes
  metag: move mm/init.c exports out of metag_ksyms.c
  metag: move usercopy.c exports out of metag_ksyms.c
  metag: move setup.c exports out of metag_ksyms.c
  metag: move kick.c exports out of metag_ksyms.c
  metag: move traps.c exports out of metag_ksyms.c
  metag: move irq enable out of irqflags.h on SMP
  ...

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>

Conflicts:
	arch/x86/kernel/kvmclock.c
parents 3ab66e8a 6dbe51c2

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ modules.builtin 
# Generated include files

#

include/config

include/linux/version.h

include/generated

arch/*/include/generated

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -1572,12 +1572,12 @@ S: Wantage, New Jersey 07461 
S: USA



N: Harald Hoyer

E: harald.hoyer@parzelle.de

W: http://parzelle.de/

E: harald@redhat.com

W: http://www.harald-hoyer.de

D: ip_masq_quake

D: md boot support

S: Hohe Strasse 30

S: D-70176 Stuttgart

S: Am Strand 5

S: D-19063 Schwerin

S: Germany



N: Jan Hubicka

Documentation/00-INDEX

+141 −12
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
This is a brief list of all the files in ./linux/Documentation and what

they contain. If you add a documentation file, please list it here in

alphabetical order as well, or risk being hunted down like a rabid dog.

Please try and keep the descriptions small enough to fit on one line.

Please keep the descriptions small enough to fit on one line.

							 Thanks -- Paul G.



Following translations are available on the WWW:
@@ -20,24 +20,33 @@ BUG-HUNTING 
Changes

	- list of changes that break older software packages.

CodingStyle

	- how the boss likes the C code in the kernel to look.

development-process/

	- An extended tutorial on how to work with the kernel development

	  process.

	- how the maintainers expect the C code in the kernel to look.

DMA-API.txt

	- DMA API, pci_ API & extensions for non-consistent memory machines.

DMA-API-HOWTO.txt

	- Dynamic DMA mapping Guide

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

DocBook/

	- directory with DocBook templates etc. for kernel documentation.

EDID/

	- directory with info on customizing EDID for broken gfx/displays.

HOWTO

	- the process and procedures of how to do Linux kernel development.

IPMI.txt

	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.

IRQ-affinity.txt

	- how to select which CPU(s) handle which interrupt events on SMP.

IRQ-domain.txt

	- info on inerrupt numbering and setting up IRQ domains.

IRQ.txt

	- description of what an IRQ is.

Intel-IOMMU.txt

	- basic info on the Intel IOMMU virtualization support.

Makefile

	- some files in Documentation dir are actually sample code to build

ManagementStyle

	- how to (attempt to) manage kernel hackers.

RCU/
@@ -66,10 +75,16 @@ applying-patches.txt 
	- description of various trees and how to apply their patches.

arm/

	- directory with info about Linux on the ARM architecture.

arm64/

	- directory with info about Linux on the 64 bit ARM architecture.

atomic_ops.txt

	- semantics and behavior of atomic and bitmask operations.

auxdisplay/

	- misc. LCD driver documentation (cfag12864b, ks0108).

backlight/

	- directory with info on controlling backlights in flat panel displays

bad_memory.txt

	- how to use kernel parameters to exclude bad RAM regions.

basic_profiling.txt

	- basic instructions for those who wants to profile Linux kernel.

binfmt_misc.txt
@@ -80,8 +95,14 @@ block/ 
	- info on the Block I/O (BIO) layer.

blockdev/

	- info on block devices & drivers

braille-console.txt

	- info on how to use serial devices for Braille support.

bt8xxgpio.txt

	- info on how to modify a bt8xx video card for GPIO usage.

btmrvl.txt

	- info on Marvell Bluetooth driver usage.

bus-devices/

	- directory with info on TI GPMC (General Purpose Memory Controller)

bus-virt-phys-mapping.txt

	- how to access I/O mapped memory from within device drivers.

cachetlb.txt
@@ -90,6 +111,12 @@ cdrom/ 
	- directory with information on the CD-ROM drivers that Linux has.

cgroups/

	- cgroups features, including cpusets and memory controller.

circular-buffers.txt

	- how to make use of the existing circular buffer infrastructure

clk.txt

	- info on the common clock framework

coccinelle.txt

	- info on how to get and use the Coccinelle code checking tool.

connector/

	- docs on the netlink based userspace<->kernel space communication mod.

console/
@@ -114,40 +141,66 @@ dcdbas.txt 
	- information on the Dell Systems Management Base Driver.

debugging-modules.txt

	- some notes on debugging modules after Linux 2.6.3.

debugging-via-ohci1394.txt

	- how to use firewire like a hardware debugger memory reader.

dell_rbu.txt

	- document demonstrating the use of the Dell Remote BIOS Update driver.

development-process/

	- how to work with the mainline kernel development process.

device-mapper/

	- directory with info on Device Mapper.

devices.txt

	- plain ASCII listing of all the nodes in /dev/ with major minor #'s.

devicetree/

	- directory with info on device tree files used by OF/PowerPC/ARM

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/

	- directory with info about Linux driver model.

dvb/

	- info on Linux Digital Video Broadcast (DVB) subsystem.

dynamic-debug-howto.txt

	- how to use the dynamic debug (dyndbg) feature.

early-userspace/

	- info about initramfs, klibc, and userspace early during boot.

edac.txt

	- information on EDAC - Error Detection And Correction

eisa.txt

	- info on EISA bus support.

email-clients.txt

	- info on how to use e-mail to send un-mangled (git) patches.

extcon/

	- directory with porting guide for Android kernel switch driver.

fault-injection/

	- dir with docs about the fault injection capabilities infrastructure.

fb/

	- directory with info on the frame buffer graphics abstraction layer.

feature-removal-schedule.txt

	- list of files and features that are going to be removed.

filesystems/

	- info on the vfs and the various filesystems that Linux supports.

firmware_class/

	- request_firmware() hotplug interface info.

flexible-arrays.txt

	- how to make use of flexible sized arrays in linux

frv/

	- Fujitsu FR-V Linux documentation.

futex-requeue-pi.txt

	- info on requeueing of tasks from a non-PI futex to a PI futex

gcov.txt

	- use of GCC's coverage testing tool "gcov" with the Linux kernel

gpio.txt

	- overview of GPIO (General Purpose Input/Output) access conventions.

hid/

	- directory with information on human interface devices

highuid.txt

	- notes on the change from 16 bit to 32 bit user/group IDs.

hwspinlock.txt

	- hardware spinlock provides hardware assistance for synchronization

timers/

	- info on the timer related topics

hw_random.txt
@@ -164,10 +217,14 @@ ia64/ 
	- directory with info about Linux on Intel 64 bit architecture.

infiniband/

	- directory with documents concerning Linux InfiniBand support.

init.txt

	- what to do when the kernel can't find the 1st process to run.

initrd.txt

	- how to use the RAM disk as an initial/temporary root filesystem.

input/

	- info on Linux input device support.

intel_txt.txt

	- info on intel Trusted Execution Technology (intel TXT).

io-mapping.txt

	- description of io_mapping functions in linux/io-mapping.h

io_ordering.txt
@@ -184,6 +241,8 @@ isdn/ 
	- directory with info on the Linux ISDN support, and supported cards.

java.txt

	- info on the in-kernel binary support for Java(tm).

ja_JP/

	- directory with Japanese translations of various documents

kbuild/

	- directory with info about the kernel build process.

kdump/
@@ -194,6 +253,12 @@ kernel-docs.txt 
	- listing of various WWW + books that document kernel internals.

kernel-parameters.txt

	- summary listing of command line / boot prompt args for the kernel.

kmemcheck.txt

	- info on dynamic checker that detects uses of uninitialized memory.

kmemleak.txt

	- info on how to make use of the kernel memory leak detection system

ko_KR/

	- directory with Korean translations of various documents

kobject.txt

	- info of the kobject infrastructure of the Linux kernel.

kprobes.txt
@@ -210,6 +275,8 @@ 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).

lockup-watchdogs.txt

	- info on soft and hard lockup detectors (aka nmi_watchdog).

logo.gif
@@ -222,16 +289,28 @@ magic-number.txt 
	- list of magic numbers used to mark/protect kernel data structures.

md.txt

	- info on boot arguments for the multiple devices driver.

media-framework.txt

	- info on media framework, its data structures, functions and usage.

memory-barriers.txt

	- info on Linux kernel memory barriers.

memory-devices/

	- directory with info on parts like the Texas Instruments EMIF driver

memory-hotplug.txt

	- Hotpluggable memory support, how to use and current status.

memory.txt

	- info on typical Linux memory problems.

metag/

	- directory with info about Linux on Meta architecture.

mips/

	- directory with info about Linux on MIPS architecture.

misc-devices/

	- directory with info about devices using the misc dev subsystem

mmc/

	- directory with info about the MMC subsystem

mn10300/

	- directory with info about the mn10300 architecture port

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
@@ -242,6 +321,8 @@ netlabel/ 
	- directory with information on the NetLabel subsystem.

networking/

	- directory with info on various aspects of networking with Linux.

nfc/

	- directory relating info about Near Field Communications support.

nommu-mmap.txt

	- documentation about no-mmu memory mapping support.

numastat.txt
@@ -258,26 +339,46 @@ parport-lowlevel.txt 
	- description and usage of the low level parallel port functions.

pcmcia/

	- info on the Linux PCMCIA driver.

percpu-rw-semaphore.txt

	- RCU based read-write semaphore optimized for locking for reading

pi-futex.txt

	- documentation on lightweight PI-futexes.

	- documentation on lightweight priority inheritance futexes.

pinctrl.txt

	- info on pinctrl subsystem and the PINMUX/PINCONF and drivers

pnp.txt

	- Linux Plug and Play documentation.

power/

	- directory with info on Linux PCI power management.

powerpc/

	- directory with info on using Linux with the PowerPC.

prctl/

	- directory with info on the priveledge control subsystem

preempt-locking.txt

	- info on locking under a preemptive kernel.

printk-formats.txt

	- how to get printk format specifiers right

pps/

	- directory with information on the pulse-per-second support

ptp/

	- directory with info on support for IEEE 1588 PTP clocks in Linux.

pwm.txt

	- info on the pulse width modulation driver subsystem

ramoops.txt

	- documentation of the ramoops oops/panic logging module.

rapidio/

	- directory with info on RapidIO packet-based fabric interconnect

rbtree.txt

	- info on what red-black trees are and what they are for.

remoteproc.txt

	- info on how to handle remote processor (e.g. AMP) offloads/usage.

rfkill.txt

	- info on the radio frequency kill switch subsystem/support.

robust-futex-ABI.txt

	- documentation of the robust futex ABI.

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
@@ -302,10 +403,10 @@ sgi-visws.txt 
	- short blurb on the SGI Visual Workstations.

sh/

	- directory with info on porting Linux to a new architecture.

smsc_ece1099.txt

	-info on the smsc Keyboard Scan Expansion/GPIO Expansion device.

sound/

	- directory with info on sound card support.

sparc/

	- directory with info on using Linux on Sparc architecture.

sparse.txt

	- info on how to obtain and use the sparse tool for typechecking.

spi/
@@ -316,6 +417,8 @@ stable_api_nonsense.txt 
	- info on why the kernel does not have a stable in-kernel api or abi.

stable_kernel_rules.txt

	- rules and procedures for the -stable kernel releases.

static-keys.txt

	- info on how static keys allow debug code in hotpaths via patching

svga.txt

	- short guide on selecting video modes at boot via VGA BIOS.

sysfs-rules.txt
@@ -324,27 +427,53 @@ sysctl/ 
	- directory with info on the /proc/sys/* files.

sysrq.txt

	- info on the magic SysRq key.

telephony/

	- directory with info on telephony (e.g. voice over IP) support.

target/

	- directory with info on generating TCM v4 fabric .ko modules

thermal/

	- directory with information on managing thermal issues (CPU/temp)

trace/

	- directory with info on tracing technologies within linux

unaligned-memory-access.txt

	- info on how to avoid arch breaking unaligned memory access in code.

unicode.txt

	- info on the Unicode character/font mapping used in Linux.

unshare.txt

	- description of the Linux unshare system call.

usb/

	- directory with info regarding the Universal Serial Bus.

vDSO/

	- directory with info regarding virtual dynamic shared objects

vfio.txt

	- info on Virtual Function I/O used in guest/hypervisor instances.

vgaarbiter.txt

	- info on enable/disable the legacy decoding on different VGA devices

video-output.txt

	- sysfs class driver interface to enable/disable a video output device.

video4linux/

	- directory with info regarding video/TV/radio cards and linux.

virtual/

	- directory with information on the various linux virtualizations.

vm/

	- directory with info on the Linux vm code.

vme_api.txt

	- file relating info on the VME bus API in linux

volatile-considered-harmful.txt

	- Why the "volatile" type class should not be used

w1/

	- directory with documents regarding the 1-wire (w1) subsystem.

watchdog/

	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)

wimax/

	- directory with info about Intel Wireless Wimax Connections

workqueue.txt

	- information on the Concurrency Managed Workqueue implementation

x86/x86_64/

	- directory with info on Linux support for AMD x86-64 (Hammer) machines.

xtensa/

	- directory with documents relating to arch/xtensa port/implementation

xz.txt

	- how to make use of the XZ data compression within linux kernel

zh_CN/

	- directory with Chinese translations of various documents

zorro.txt

	- info on writing drivers for Zorro bus devices found on Amigas.

Documentation/ABI/README

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ The different levels of stability are: 
	the kernel, but are marked to be removed at some later point in

	time.  The description of the interface will document the reason

	why it is obsolete and when it can be expected to be removed.

	The file Documentation/feature-removal-schedule.txt may describe

	some of these interfaces, giving a schedule for when they will

	be removed.



  removed/

	This directory contains a list of the old interfaces that have

Documentation/ABI/stable/sysfs-class-tpm

0 → 100644
+185 −0
Original line number Diff line number Diff line 
What:		/sys/class/misc/tpmX/device/

Date:		April 2005

KernelVersion:	2.6.12

Contact:	tpmdd-devel@lists.sf.net

Description:	The device/ directory under a specific TPM instance exposes

		the properties of that TPM chip





What:		/sys/class/misc/tpmX/device/active

Date:		April 2006

KernelVersion:	2.6.17

Contact:	tpmdd-devel@lists.sf.net

Description:	The "active" property prints a '1' if the TPM chip is accepting

		commands. An inactive TPM chip still contains all the state of

		an active chip (Storage Root Key, NVRAM, etc), and can be

		visible to the OS, but will only accept a restricted set of

		commands. See the TPM Main Specification part 2, Structures,

		section 17 for more information on which commands are

		available.



What:		/sys/class/misc/tpmX/device/cancel

Date:		June 2005

KernelVersion:	2.6.13

Contact:	tpmdd-devel@lists.sf.net

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

Date:		April 2005

KernelVersion:	2.6.12

Contact:	tpmdd-devel@lists.sf.net

Description:	The "caps" property contains TPM manufacturer and version info.



		Example output:



		Manufacturer: 0x53544d20

		TCG version: 1.2

		Firmware version: 8.16



		Manufacturer is a hex dump of the 4 byte manufacturer info

		space in a TPM. TCG version shows the TCG TPM spec level that

		the chip supports. Firmware version is that of the chip and

		is manufacturer specific.



What:		/sys/class/misc/tpmX/device/durations

Date:		March 2011

KernelVersion:	3.1

Contact:	tpmdd-devel@lists.sf.net

Description:	The "durations" property shows the 3 vendor-specific values

		used to wait for a short, medium and long TPM command. All

		TPM commands are categorized as short, medium or long in

		execution time, so that the driver doesn't have to wait

		any longer than necessary before starting to poll for a

		result.



		Example output:



		3015000 4508000 180995000 [original]



		Here the short, medium and long durations are displayed in

		usecs. "[original]" indicates that the values are displayed

		unmodified from when they were queried from the chip.

		Durations can be modified in the case where a buggy chip

		reports them in msec instead of usec and they need to be

		scaled to be displayed in usecs. In this case "[adjusted]"

		will be displayed in place of "[original]".



What:		/sys/class/misc/tpmX/device/enabled

Date:		April 2006

KernelVersion:	2.6.17

Contact:	tpmdd-devel@lists.sf.net

Description:	The "enabled" property prints a '1' if the TPM chip is enabled,

		meaning that it should be visible to the OS. This property

		may be visible but produce a '0' after some operation that

		disables the TPM.



What:		/sys/class/misc/tpmX/device/owned

Date:		April 2006

KernelVersion:	2.6.17

Contact:	tpmdd-devel@lists.sf.net

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

Date:		April 2005

KernelVersion:	2.6.12

Contact:	tpmdd-devel@lists.sf.net

Description:	The "pcrs" property will dump the current value of all Platform

		Configuration Registers in the TPM. Note that since these

		values may be constantly changing, the output is only valid

		for a snapshot in time.



		Example output:



		PCR-00: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75

		PCR-01: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75

		PCR-02: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75

		PCR-03: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75

		PCR-04: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75

		...



		The number of PCRs and hex bytes needed to represent a PCR

		value will vary depending on TPM chip version. For TPM 1.1 and

		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

Date:		April 2005

KernelVersion:	2.6.12

Contact:	tpmdd-devel@lists.sf.net

Description:	The "pubek" property will return the TPM's public endorsement

		key if possible. If the TPM has had ownership established and

		is version 1.2, the pubek will not be available without the

		owner's authorization. Since the TPM driver doesn't store any

		secrets, it can't authorize its own request for the pubek,

		making it unaccessible. The public endorsement key is gener-

		ated at TPM menufacture time and exists for the life of the

		chip.



		Example output:



		Algorithm: 00 00 00 01

		Encscheme: 00 03

		Sigscheme: 00 01

		Parameters: 00 00 08 00 00 00 00 02 00 00 00 00

		Modulus length: 256

		Modulus:

		B4 76 41 82 C9 20 2C 10 18 40 BC 8B E5 44 4C 6C

		3A B2 92 0C A4 9B 2A 83 EB 5C 12 85 04 48 A0 B6

		1E E4 81 84 CE B2 F2 45 1C F0 85 99 61 02 4D EB

		86 C4 F7 F3 29 60 52 93 6B B2 E5 AB 8B A9 09 E3

		D7 0E 7D CA 41 BF 43 07 65 86 3C 8C 13 7A D0 8B

		82 5E 96 0B F8 1F 5F 34 06 DA A2 52 C1 A9 D5 26

		0F F4 04 4B D9 3F 2D F2 AC 2F 74 64 1F 8B CD 3E

		1E 30 38 6C 70 63 69 AB E2 50 DF 49 05 2E E1 8D

		6F 78 44 DA 57 43 69 EE 76 6C 38 8A E9 8E A3 F0

		A7 1F 3C A8 D0 12 15 3E CA 0E BD FA 24 CD 33 C6

		47 AE A4 18 83 8E 22 39 75 93 86 E6 FD 66 48 B6

		10 AD 94 14 65 F9 6A 17 78 BD 16 53 84 30 BF 70

		E0 DC 65 FD 3C C6 B0 1E BF B9 C1 B5 6C EF B1 3A

		F8 28 05 83 62 26 11 DC B4 6B 5A 97 FF 32 26 B6

		F7 02 71 CF 15 AE 16 DD D1 C1 8E A8 CF 9B 50 7B

		C3 91 FF 44 1E CF 7C 39 FE 17 77 21 20 BD CE 9B



		Possible values:



		Algorithm:	TPM_ALG_RSA			(1)

		Encscheme:	TPM_ES_RSAESPKCSv15		(2)

				TPM_ES_RSAESOAEP_SHA1_MGF1	(3)

		Sigscheme:	TPM_SS_NONE			(1)

		Parameters, a byte string of 3 u32 values:

			Key Length (bits):	00 00 08 00	(2048)

			Num primes:		00 00 00 02	(2)

			Exponent Size:		00 00 00 00	(0 means the

								 default exp)

		Modulus Length: 256 (bytes)

		Modulus:	The 256 byte Endorsement Key modulus



What:		/sys/class/misc/tpmX/device/temp_deactivated

Date:		April 2006

KernelVersion:	2.6.17

Contact:	tpmdd-devel@lists.sf.net

Description:	The "temp_deactivated" property returns a '1' if the chip has

		been temporarily dectivated, usually until the next power

		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

Date:		March 2011

KernelVersion:	3.1

Contact:	tpmdd-devel@lists.sf.net

Description:	The "timeouts" property shows the 4 vendor-specific values

		for the TPM's interface spec timeouts. The use of these

		timeouts is defined by the TPM interface spec that the chip

		conforms to.



		Example output:



		750000 750000 750000 750000 [original]



		The four timeout values are shown in usecs, with a trailing

		"[original]" or "[adjusted]" depending on whether the values

		were scaled by the driver to be reported in usec from msecs.