Commit 478c6a43 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'linus' into release 



Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 8a3f257c 6bb59750

CREDITS

+17 −2
Original line number Diff line number Diff line
@@ -495,6 +495,11 @@ S: Kopmansg 2 
S: 411 13  Goteborg

S: Sweden



N: Paul Bristow

E: paul@paulbristow.net

W: http://paulbristow.net/linux/idefloppy.html

D: Maintainer of IDE/ATAPI floppy driver



N: Dominik Brodowski

E: linux@brodo.de

W: http://www.brodo.de/
@@ -1407,8 +1412,8 @@ P: 1024D/77D4FC9B F5C5 1C20 1DFC DEC3 3107 54A4 2332 ADFC 77D4 FC9B 
D: National Language Support

D: Linux Internationalization Project

D: German Localization for Linux and GNU software

S: Kriemhildring 12a

S: 65795 Hattersheim am Main

S: Auf der Fittel 18

S: 53347 Alfter

S: Germany



N: Christoph Hellwig
@@ -2642,6 +2647,10 @@ S: C/ Mieses 20, 9-B 
S: Valladolid 47009

S: Spain



N: Gadi Oxman

E: gadio@netvision.net.il

D: Original author and maintainer of IDE/ATAPI floppy/tape drivers



N: Greg Page

E: gpage@sovereign.org

D: IPX development and support
@@ -3571,6 +3580,12 @@ N: Dirk Verworner 
D: Co-author of German book ``Linux-Kernel-Programmierung''

D: Co-founder of Berlin Linux User Group



N: Riku Voipio

E: riku.voipio@iki.fi

D: Author of PCA9532 LED and Fintek f75375s hwmon driver

D: Some random ARM board patches

S: Finland



N: Patrick Volkerding

E: volkerdi@ftp.cdrom.com

D: Produced the Slackware distribution, updated the SVGAlib

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ cachetlb.txt 
	- describes the cache/TLB flushing interfaces Linux uses.

cdrom/

	- directory with information on the CD-ROM drivers that Linux has.

cgroups/

	- cgroups features, including cpusets and memory controller.

connector/

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

console/
@@ -98,8 +100,6 @@ cpu-load.txt 
	- document describing how CPU load statistics are collected.

cpuidle/

	- info on CPU_IDLE, CPU idle state management subsystem.

cpusets.txt

	- documents the cpusets feature; assign CPUs and Mem to a set of tasks.

cputopology.txt

	- documentation on how CPU topology info is exported via sysfs.

cris/

Documentation/ABI/testing/ima_policy

0 → 100644
+61 −0
Original line number Diff line number Diff line 
What:		security/ima/policy

Date:		May 2008

Contact:	Mimi Zohar <zohar@us.ibm.com>

Description:

		The Trusted Computing Group(TCG) runtime Integrity

		Measurement Architecture(IMA) maintains a list of hash

		values of executables and other sensitive system files

		loaded into the run-time of this system.  At runtime,

		the policy can be constrained based on LSM specific data.

		Policies are loaded into the securityfs file ima/policy

		by opening the file, writing the rules one at a time and

		then closing the file.  The new policy takes effect after

		the file ima/policy is closed.



		rule format: action [condition ...]



		action: measure | dont_measure

		condition:= base | lsm

			base:	[[func=] [mask=] [fsmagic=] [uid=]]

			lsm:	[[subj_user=] [subj_role=] [subj_type=]

				 [obj_user=] [obj_role=] [obj_type=]]



		base: 	func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			uid:= decimal value

		lsm:  	are LSM specific



		default policy:

			# PROC_SUPER_MAGIC

			dont_measure fsmagic=0x9fa0

			# SYSFS_MAGIC

			dont_measure fsmagic=0x62656572

			# DEBUGFS_MAGIC

			dont_measure fsmagic=0x64626720

			# TMPFS_MAGIC

			dont_measure fsmagic=0x01021994

			# SECURITYFS_MAGIC

			dont_measure fsmagic=0x73636673



			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=INODE_PERM mask=MAY_READ uid=0



		The default policy measures all executables in bprm_check,

		all files mmapped executable in file_mmap, and all files

		open for read by root in inode_permission.



		Examples of LSM specific definitions:



		SELinux:

			# SELINUX_MAGIC

			dont_measure fsmagic=0xF97CFF8C



			dont_measure obj_type=var_log_t

			dont_measure obj_type=auditd_log_t

			measure subj_user=system_u func=INODE_PERM mask=MAY_READ

			measure subj_role=system_r func=INODE_PERM mask=MAY_READ



		Smack:

			measure subj_user=_ func=INODE_PERM mask=MAY_READ

Documentation/ABI/testing/sysfs-bus-pci

+70 −0
Original line number Diff line number Diff line
@@ -41,6 +41,49 @@ Description: 
		for the device and attempt to bind to it.  For example:

		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/new_id



What:		/sys/bus/pci/drivers/.../remove_id

Date:		February 2009

Contact:	Chris Wright <chrisw@sous-sol.org>

Description:

		Writing a device ID to this file will remove an ID

		that was dynamically added via the new_id sysfs entry.

		The format for the device ID is:

		VVVV DDDD SVVV SDDD CCCC MMMM.	That is Vendor ID, Device

		ID, Subsystem Vendor ID, Subsystem Device ID, Class,

		and Class Mask.  The Vendor ID and Device ID fields are

		required, the rest are optional.  After successfully

		removing an ID, the driver will no longer support the

		device.  This is useful to ensure auto probing won't

		match the driver to the device.  For example:

		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/remove_id



What:		/sys/bus/pci/rescan

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Description:

		Writing a non-zero value to this attribute will

		force a rescan of all PCI buses in the system, and

		re-discover previously removed devices.

		Depends on CONFIG_HOTPLUG.



What:		/sys/bus/pci/devices/.../remove

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Description:

		Writing a non-zero value to this attribute will

		hot-remove the PCI device and any of its children.

		Depends on CONFIG_HOTPLUG.



What:		/sys/bus/pci/devices/.../rescan

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Description:

		Writing a non-zero value to this attribute will

		force a rescan of the device's parent bus and all

		child buses, and re-discover devices removed earlier

		from this part of the device tree.

		Depends on CONFIG_HOTPLUG.



What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>
@@ -52,3 +95,30 @@ Description: 
		that some devices may have malformatted data.  If the

		underlying VPD has a writable section then the

		corresponding section of this file will be writable.



What:		/sys/bus/pci/devices/.../virtfnN

Date:		March 2009

Contact:	Yu Zhao <yu.zhao@intel.com>

Description:

		This symbolic link appears when hardware supports the SR-IOV

		capability and the Physical Function driver has enabled it.

		The symbolic link points to the PCI device sysfs entry of the

		Virtual Function whose index is N (0...MaxVFs-1).



What:		/sys/bus/pci/devices/.../dep_link

Date:		March 2009

Contact:	Yu Zhao <yu.zhao@intel.com>

Description:

		This symbolic link appears when hardware supports the SR-IOV

		capability and the Physical Function driver has enabled it,

		and this device has vendor specific dependencies with others.

		The symbolic link points to the PCI device sysfs entry of

		Physical Function this device depends on.



What:		/sys/bus/pci/devices/.../physfn

Date:		March 2009

Contact:	Yu Zhao <yu.zhao@intel.com>

Description:

		This symbolic link appears when a device is a Virtual Function.

		The symbolic link points to the PCI device sysfs entry of the

		Physical Function this device associates with.

Documentation/ABI/testing/sysfs-class-regulator

+48 −9
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ KernelVersion: 2.6.26 
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Some regulator directories will contain a field called

		state. This reports the regulator enable status, for

		regulators which can report that value.

		state. This reports the regulator enable control, for

		regulators which can report that input value.



		This will be one of the following strings:
@@ -14,16 +14,54 @@ Description: 
		'unknown'



		'enabled' means the regulator output is ON and is supplying

		power to the system.

		power to the system (assuming no error prevents it).



		'disabled' means the regulator output is OFF and is not

		supplying power to the system..

		supplying power to the system (unless some non-Linux

		control has enabled it).



		'unknown' means software cannot determine the state, or

		the reported state is invalid.



		NOTE: this field can be used in conjunction with microvolts

		and microamps to determine regulator output levels.

		or microamps to determine configured regulator output levels.





What:		/sys/class/regulator/.../status

Description:

		Some regulator directories will contain a field called

		"status". This reports the current regulator status, for

		regulators which can report that output value.



		This will be one of the following strings:



			off

			on

			error

			fast

			normal

			idle

			standby



		"off" means the regulator is not supplying power to the

		system.



		"on" means the regulator is supplying power to the system,

		and the regulator can't report a detailed operation mode.



		"error" indicates an out-of-regulation status such as being

		disabled due to thermal shutdown, or voltage being unstable

		because of problems with the input power supply.



		"fast", "normal", "idle", and "standby" are all detailed

		regulator operation modes (described elsewhere).  They

		imply "on", but provide more detail.



		Note that regulator status is a function of many inputs,

		not limited to control inputs from Linux.  For example,

		the actual load presented may trigger "error" status; or

		a regulator may be enabled by another user, even though

		Linux did not enable it.





What:		/sys/class/regulator/.../type
@@ -58,7 +96,7 @@ Description: 
		Some regulator directories will contain a field called

		microvolts. This holds the regulator output voltage setting

		measured in microvolts (i.e. E-6 Volts), for regulators

		which can report that voltage.

		which can report the control input for voltage.



		NOTE: This value should not be used to determine the regulator

		output voltage level as this value is the same regardless of
@@ -73,7 +111,7 @@ Description: 
		Some regulator directories will contain a field called

		microamps. This holds the regulator output current limit

		setting measured in microamps (i.e. E-6 Amps), for regulators

		which can report that current.

		which can report the control input for a current limit.



		NOTE: This value should not be used to determine the regulator

		output current level as this value is the same regardless of
@@ -87,7 +125,7 @@ Contact: Liam Girdwood <lrg@slimlogic.co.uk> 
Description:

		Some regulator directories will contain a field called

		opmode. This holds the current regulator operating mode,

		for regulators which can report it.

		for regulators which can report that control input value.



		The opmode value can be one of the following strings:
@@ -101,7 +139,8 @@ Description: 


		NOTE: This value should not be used to determine the regulator

		output operating mode as this value is the same regardless of

		whether the regulator is enabled or disabled.

		whether the regulator is enabled or disabled.  A "status"

		attribute may be available to determine the actual mode.





What:		/sys/class/regulator/.../min_microvolts