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

Commit d4d9781d authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'master' of...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
parents f5a18f93 396e6e49
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
What:		/sys/o2cb symlink
Date:		May 2011
KernelVersion:	2.6.40
KernelVersion:	3.0
Contact:	ocfs2-devel@oss.oracle.com
Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
		removed when new versions of ocfs2-tools which know to look
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Description:
	/dev/raw1394 was a character device file that allowed low-level
	access to FireWire buses.  Its major drawbacks were its inability
	to implement sensible device security policies, and its low level
	of abstraction that required userspace clients do duplicate much
	of abstraction that required userspace clients to duplicate much
	of the kernel's ieee1394 core functionality.
	Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
	firewire-core.
+23 −0
Original line number Diff line number Diff line
What:		security/evm
Date:		March 2011
Contact:	Mimi Zohar <zohar@us.ibm.com>
Description:
		EVM protects a file's security extended attributes(xattrs)
		against integrity attacks. The initial method maintains an
		HMAC-sha1 value across the extended attributes, storing the
		value as the extended attribute 'security.evm'.

		EVM depends on the Kernel Key Retention System to provide it
		with a trusted/encrypted key for the HMAC-sha1 operation.
		The key is loaded onto the root's keyring using keyctl.  Until
		EVM receives notification that the key has been successfully
		loaded onto the keyring (echo 1 > <securityfs>/evm), EVM
		can not create or validate the 'security.evm' xattr, but
		returns INTEGRITY_UNKNOWN.  Loading the key and signaling EVM
		should be done as early as possible.  Normally this is done
		in the initramfs, which has already been measured as part
		of the trusted boot.  For more information on creating and
		loading existing trusted/encrypted keys, refer to:
		Documentation/keys-trusted-encrypted.txt.  (A sample dracut
		patch, which loads the trusted/encrypted key and enables
		EVM, is available from http://linux-ima.sourceforge.net/#EVM.)
+4 −4
Original line number Diff line number Diff line
What:		/sys/bus/bcma/devices/.../manuf
Date:		May 2011
KernelVersion:	2.6.40
KernelVersion:	3.0
Contact:	Rafał Miłecki <zajec5@gmail.com>
Description:
		Each BCMA core has it's manufacturer id. See
@@ -8,7 +8,7 @@ Description:

What:		/sys/bus/bcma/devices/.../id
Date:		May 2011
KernelVersion:	2.6.40
KernelVersion:	3.0
Contact:	Rafał Miłecki <zajec5@gmail.com>
Description:
		There are a few types of BCMA cores, they can be identified by
@@ -16,7 +16,7 @@ Description:

What:		/sys/bus/bcma/devices/.../rev
Date:		May 2011
KernelVersion:	2.6.40
KernelVersion:	3.0
Contact:	Rafał Miłecki <zajec5@gmail.com>
Description:
		BCMA cores of the same type can still slightly differ depending
@@ -24,7 +24,7 @@ Description:

What:		/sys/bus/bcma/devices/.../class
Date:		May 2011
KernelVersion:	2.6.40
KernelVersion:	3.0
Contact:	Rafał Miłecki <zajec5@gmail.com>
Description:
		Each BCMA core is identified by few fields, including class it
+46 −0
Original line number Diff line number Diff line
What:		/sys/bus/pci/drivers/ehci_hcd/.../companion
		/sys/bus/usb/devices/usbN/../companion
Date:		January 2007
KernelVersion:	2.6.21
Contact:	Alan Stern <stern@rowland.harvard.edu>
Description:
		PCI-based EHCI USB controllers (i.e., high-speed USB-2.0
		controllers) are often implemented along with a set of
		"companion" full/low-speed USB-1.1 controllers.  When a
		high-speed device is plugged in, the connection is routed
		to the EHCI controller; when a full- or low-speed device
		is plugged in, the connection is routed to the companion
		controller.

		Sometimes you want to force a high-speed device to connect
		at full speed, which can be accomplished by forcing the
		connection to be routed to the companion controller.
		That's what this file does.  Writing a port number to the
		file causes connections on that port to be routed to the
		companion controller, and writing the negative of a port
		number returns the port to normal operation.

		For example: To force the high-speed device attached to
		port 4 on bus 2 to run at full speed:

			echo 4 >/sys/bus/usb/devices/usb2/../companion

		To return the port to high-speed operation:

			echo -4 >/sys/bus/usb/devices/usb2/../companion

		Reading the file gives the list of ports currently forced
		to the companion controller.

		Note: Some EHCI controllers do not have companions; they
		may contain an internal "transaction translator" or they
		may be attached directly to a "rate-matching hub".  This
		mechanism will not work with such controllers.  Also, it
		cannot be used to force a port on a high-speed hub to
		connect at full speed.

		Note: When this file was first added, it appeared in a
		different sysfs directory.  The location given above is
		correct for 2.6.35 (and probably several earlier kernel
		versions as well).
Loading