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

Commit f790c0ca authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of /repos/git/linux-2.6 



Conflicts:
	net/ipv4/netfilter/nf_nat_core.c
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_conntrack_netlink.c

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parents 9ab48ddc 25cf84cf

.gitignore

+3 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
*.lst

*.symtypes

*.order

modules.builtin

*.elf

*.bin

*.gz
@@ -35,7 +36,9 @@ 
#

tags

TAGS

linux

vmlinux

vmlinuz

System.map

Module.markers

Module.symvers
@@ -45,14 +48,8 @@ Module.symvers 
#

# Generated include files

#

include/asm

include/asm-*/asm-offsets.h

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h

include/linux/bounds.h

include/generated



# stgit generated dirs

Documentation/ABI/stable/sysfs-devices-node

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/devices/system/node/nodeX

Date:		October 2002

Contact:	Linux Memory Management list <linux-mm@kvack.org>

Description:

		When CONFIG_NUMA is enabled, this is a directory containing

		information on node X such as what CPUs are local to the

		node.

Documentation/ABI/testing/ima_policy

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Description: 
			lsm:	[[subj_user=] [subj_role=] [subj_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]

			fsmagic:= hex value

			uid:= decimal value
@@ -40,11 +40,11 @@ Description: 


			measure func=BPRM_CHECK

			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,

		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:
@@ -54,8 +54,8 @@ Description: 


			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

			measure subj_user=system_u func=FILE_CHECK mask=MAY_READ

			measure subj_role=system_r func=FILE_CHECK mask=MAY_READ



		Smack:

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

Documentation/ABI/testing/sysfs-block

+14 −0
Original line number Diff line number Diff line
@@ -128,3 +128,17 @@ Description: 
		preferred request size for workloads where sustained

		throughput is desired.  If no optimal I/O size is

		reported this file contains 0.



What:		/sys/block/<disk>/queue/nomerges

Date:		January 2010

Contact:

Description:

		Standard I/O elevator operations include attempts to

		merge contiguous I/Os. For known random I/O loads these

		attempts will always fail and result in extra cycles

		being spent in the kernel. This allows one to turn off

		this behavior on one of two ways: When set to 1, complex

		merge checks are disabled, but the simple one-shot merges

		with the previous I/O request are enabled. When set to 2,

		all merge tries are disabled. The default value is 0 -

		which enables all types of merge tries.

Documentation/ABI/testing/sysfs-bus-usb

+21 −8
Original line number Diff line number Diff line
@@ -21,25 +21,27 @@ Contact: Alan Stern <stern@rowland.harvard.edu> 
Description:

		Each USB device directory will contain a file named

		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,

		although normal suspends for system sleep will still

		be honored.  "auto" means the device will autosuspend

		and autoresume in the usual manner, according to the

		capabilities of its driver.  "suspend" means the device

		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).

		capabilities of its driver.



		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

		free to wake up in response to I/O requests, you should

		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

Date:		May 2007

KernelVersion:	2.6.23
@@ -157,3 +159,14 @@ Description: 
		device.  This is useful to ensure auto probing won't

		match the driver to the device.  For example:

		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id



What:		/sys/bus/usb/device/.../avoid_reset

Date:		December 2009

Contact:	Oliver Neukum <oliver@neukum.org>

Description:

		Writing 1 to this file tells the kernel that this

		device will morph into another mode when it is reset.

		Drivers will not use reset for error handling for

		such devices.

Users:

		usb_modeswitch