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

Commit d6363844 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 rmobile-latest
parents f1e0477a 1a67a573
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.
+19 −0
Original line number Diff line number Diff line
What:		/sys/kernel/debug/ideapad/cfg
Date:		Sep 2011
KernelVersion:	3.2
Contact:	Ike Panhc <ike.pan@canonical.com>
Description:

cfg shows the return value of _CFG method in VPC2004 device. It tells machine
capability and what graphic component within the machine.


What:		/sys/kernel/debug/ideapad/status
Date:		Sep 2011
KernelVersion:	3.2
Contact:	Ike Panhc <ike.pan@canonical.com>
Description:

status shows infos we can read and tells its meaning and value.

+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.)
+13 −0
Original line number Diff line number Diff line
@@ -206,3 +206,16 @@ Description:
		when a discarded area is read the discard_zeroes_data
		parameter will be set to one. Otherwise it will be 0 and
		the result of reading a discarded area is undefined.
What:		/sys/block/<disk>/alias
Date:		Aug 2011
Contact:	Nao Nishijima <nao.nishijima.xt@hitachi.com>
Description:
		A raw device name of a disk does not always point a same disk
		each boot-up time. Therefore, users have to use persistent
		device names, which udev creates when the kernel finds a disk,
		instead of raw device name. However, kernel doesn't show those
		persistent names on its messages (e.g. dmesg).
		This file can store an alias of the disk and it would be
		appeared in kernel messages if it is set. A disk can have an
		alias which length is up to 255bytes. Users can use alphabets,
		numbers, "-" and "_" in alias name. This file is writeonce.
Loading