Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (a7790532) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	*.lst		*.lst
	*.symtypes		*.symtypes
	*.order		*.order
			modules.builtin
	*.elf		*.elf
	*.bin		*.bin
	*.gz		*.gz
	@@ -36,6 +37,7 @@
	tags		tags
	TAGS		TAGS
	vmlinux		vmlinux
			vmlinuz
	System.map		System.map
	Module.markers		Module.markers
	Module.symvers		Module.symvers
	@@ -45,14 +47,8 @@ Module.symvers
	#		#
	# Generated include files		# Generated include files
	#		#
	include/asm
	include/asm-*/asm-offsets.h
	include/config		include/config
	include/linux/autoconf.h
	include/linux/compile.h
	include/linux/version.h		include/linux/version.h
	include/linux/utsrelease.h
	include/linux/bounds.h
	include/generated		include/generated

	# stgit generated dirs		# stgit generated dirs

Documentation/ABI/testing/ima_policy

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ Description:
	lsm: [[subj_user=] [subj_role=] [subj_type=]		lsm: [[subj_user=] [subj_role=] [subj_type=]
	[obj_user=] [obj_role=] [obj_type=]]		[obj_user=] [obj_role=] [obj_type=]]

	base: func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]		base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
	mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]		mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
	fsmagic:= hex value		fsmagic:= hex value
	uid:= decimal value		uid:= decimal value
	@@ -40,11 +40,11 @@ Description:

	measure func=BPRM_CHECK		measure func=BPRM_CHECK
	measure func=FILE_MMAP mask=MAY_EXEC		measure func=FILE_MMAP mask=MAY_EXEC
	measure func=INODE_PERM mask=MAY_READ uid=0		measure func=FILE_CHECK mask=MAY_READ uid=0

	The default policy measures all executables in bprm_check,		The default policy measures all executables in bprm_check,
	all files mmapped executable in file_mmap, and all files		all files mmapped executable in file_mmap, and all files
	open for read by root in inode_permission.		open for read by root in do_filp_open.

	Examples of LSM specific definitions:		Examples of LSM specific definitions:

	@@ -54,8 +54,8 @@ Description:

	dont_measure obj_type=var_log_t		dont_measure obj_type=var_log_t
	dont_measure obj_type=auditd_log_t		dont_measure obj_type=auditd_log_t
	measure subj_user=system_u func=INODE_PERM mask=MAY_READ		measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
	measure subj_role=system_r func=INODE_PERM mask=MAY_READ		measure subj_role=system_r func=FILE_CHECK mask=MAY_READ

	Smack:		Smack:
	measure subj_user=_ func=INODE_PERM mask=MAY_READ		measure subj_user=_ func=FILE_CHECK mask=MAY_READ

Documentation/ABI/testing/sysfs-bus-usb

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -21,25 +21,27 @@ Contact: Alan Stern <stern@rowland.harvard.edu>
	Description:		Description:
	Each USB device directory will contain a file named		Each USB device directory will contain a file named
	power/level. This file holds a power-level setting for		power/level. This file holds a power-level setting for
	the device, one of "on", "auto", or "suspend".		the device, either "on" or "auto".

	"on" means that the device is not allowed to autosuspend,		"on" means that the device is not allowed to autosuspend,
	although normal suspends for system sleep will still		although normal suspends for system sleep will still
	be honored. "auto" means the device will autosuspend		be honored. "auto" means the device will autosuspend
	and autoresume in the usual manner, according to the		and autoresume in the usual manner, according to the
	capabilities of its driver. "suspend" means the device		capabilities of its driver.
	is forced into a suspended state and it will not autoresume
	in response to I/O requests. However remote-wakeup requests
	from the device may still be enabled (the remote-wakeup
	setting is controlled separately by the power/wakeup
	attribute).

	During normal use, devices should be left in the "auto"		During normal use, devices should be left in the "auto"
	level. The other levels are meant for administrative uses.		level. The "on" level is meant for administrative uses.
	If you want to suspend a device immediately but leave it		If you want to suspend a device immediately but leave it
	free to wake up in response to I/O requests, you should		free to wake up in response to I/O requests, you should
	write "0" to power/autosuspend.		write "0" to power/autosuspend.

			Device not capable of proper suspend and resume should be
			left in the "on" level. Although the USB spec requires
			devices to support suspend/resume, many of them do not.
			In fact so many don't that by default, the USB core
			initializes all non-hub devices in the "on" level. Some
			drivers may change this setting when they are bound.

	What: /sys/bus/usb/devices/.../power/persist		What: /sys/bus/usb/devices/.../power/persist
	Date: May 2007		Date: May 2007
	KernelVersion: 2.6.23		KernelVersion: 2.6.23

Documentation/ABI/testing/sysfs-memory-page-offline

0 → 100644

+44 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/devices/system/memory/soft_offline_page
			Date: Sep 2009
			KernelVersion: 2.6.33
			Contact: andi@firstfloor.org
			Description:
			Soft-offline the memory page containing the physical address
			written into this file. Input is a hex number specifying the
			physical address of the page. The kernel will then attempt
			to soft-offline it, by moving the contents elsewhere or
			dropping it if possible. The kernel will then be placed
			on the bad page list and never be reused.

			The offlining is done in kernel specific granuality.
			Normally it's the base page size of the kernel, but
			this might change.

			The page must be still accessible, not poisoned. The
			kernel will never kill anything for this, but rather
			fail the offline. Return value is the size of the
			number, or a error when the offlining failed. Reading
			the file is not allowed.

			What: /sys/devices/system/memory/hard_offline_page
			Date: Sep 2009
			KernelVersion: 2.6.33
			Contact: andi@firstfloor.org
			Description:
			Hard-offline the memory page containing the physical
			address written into this file. Input is a hex number
			specifying the physical address of the page. The
			kernel will then attempt to hard-offline the page, by
			trying to drop the page or killing any owner or
			triggering IO errors if needed. Note this may kill
			any processes owning the page. The kernel will avoid
			to access this page assuming it's poisoned by the
			hardware.

			The offlining is done in kernel specific granuality.
			Normally it's the base page size of the kernel, but
			this might change.

			Return value is the size of the number, or a error when
			the offlining failed.
			Reading the file is not allowed.

Documentation/Changes

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,8 @@ o oprofile 0.9 # oprofiled --version
	o udev 081 # udevinfo -V		o udev 081 # udevinfo -V
	o grub 0.93 # grub --version		o grub 0.93 # grub --version
	o mcelog 0.6		o mcelog 0.6
			o iptables 1.4.1 # iptables -V


	Kernel compilation		Kernel compilation
	==================		==================