Merge branch 'devel' of... (45b86a96) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/cciss.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,11 +21,14 @@ This driver is known to work with the following cards:
		* SA E200
		* SA E200i
		* SA E500
		* SA P700m
		* SA P212
		* SA P410
		* SA P410i
		* SA P411
		* SA P812
		* SA P712m
		* SA P711m

		Detecting drive failures:
		-------------------------

Documentation/email-clients.txt

+25 −0

Original line number	Diff line number	Diff line
		@@ -213,4 +213,29 @@ TkRat (GUI)

		Works. Use "Insert file..." or external editor.

		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		Gmail (Web GUI)

		If you just have to use Gmail to send patches, it CAN be made to work. It
		requires a bit of external help, though.

		The first problem is that Gmail converts tabs to spaces. This will
		totally break your patches. To prevent this, you have to use a different
		editor. There is a firefox extension called "ViewSourceWith"
		(https://addons.mozilla.org/en-US/firefox/addon/394) which allows you to
		edit any text box in the editor of your choice. Configure it to launch
		your favorite editor. When you want to send a patch, use this technique.
		Once you have crafted your messsage + patch, save and exit the editor,
		which should reload the Gmail edit box. GMAIL WILL PRESERVE THE TABS.
		Hoorah. Apparently you can cut-n-paste literal tabs, but Gmail will
		convert those to spaces upon sending!

		The second problem is that Gmail converts tabs to spaces on replies. If
		you reply to a patch, don't expect to be able to apply it as a patch.

		The last problem is that Gmail will base64-encode any message that has a
		non-ASCII character. That includes things like European names. Be aware.

		Gmail is not convenient for lkml patches, but CAN be made to work.

		###

Documentation/filesystems/vfat.txt

+30 −2

Original line number	Diff line number	Diff line
		@@ -8,6 +8,12 @@ if you want to format from within Linux.

		VFAT MOUNT OPTIONS
		----------------------------------------------------------------------
		uid=### -- Set the owner of all files on this filesystem.
		The default is the uid of current process.

		gid=### -- Set the group of all files on this filesystem.
		The default is the gid of current process.

		umask=### -- The permission mask (for files and directories, see umask(1)).
		The default is the umask of current process.

		@@ -36,7 +42,7 @@ codepage=### -- Sets the codepage number for converting to shortname
		characters on FAT filesystem.
		By default, FAT_DEFAULT_CODEPAGE setting is used.

		iocharset=name -- Character set to use for converting between the
		iocharset=<name> -- Character set to use for converting between the
		encoding is used for user visible filename and 16 bit
		Unicode characters. Long filenames are stored on disk
		in Unicode format, but Unix for the most part doesn't
		@@ -86,6 +92,8 @@ check=s\|r\|n -- Case sensitivity checking setting.
		r: relaxed, case insensitive
		n: normal, default setting, currently case insensitive

		nocase -- This was deprecated for vfat. Use shortname=win95 instead.

		shortname=lower\|win95\|winnt\|mixed
		-- Shortname display/create setting.
		lower: convert to lowercase for display,
		@@ -99,11 +107,31 @@ shortname=lower\|win95\|winnt\|mixed
		tz=UTC -- Interpret timestamps as UTC rather than local time.
		This option disables the conversion of timestamps
		between local time (as used by Windows on FAT) and UTC
		(which Linux uses internally). This is particuluarly
		(which Linux uses internally). This is particularly
		useful when mounting devices (like digital cameras)
		that are set to UTC in order to avoid the pitfalls of
		local time.

		showexec -- If set, the execute permission bits of the file will be
		allowed only if the extension part of the name is .EXE,
		.COM, or .BAT. Not set by default.

		debug -- Can be set, but unused by the current implementation.

		sys_immutable -- If set, ATTR_SYS attribute on FAT is handled as
		IMMUTABLE flag on Linux. Not set by default.

		flush -- If set, the filesystem will try to flush to disk more
		early than normal. Not set by default.

		rodir -- FAT has the ATTR_RO (read-only) attribute. But on Windows,
		the ATTR_RO of the directory will be just ignored actually,
		and is used by only applications as flag. E.g. it's setted
		for the customized folder.

		If you want to use ATTR_RO as read-only flag even for
		the directory, set this option.

		<bool>: 0,1,yes,no,true,false

		TODO

Documentation/kernel-parameters.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -995,13 +995,15 @@ and is between 256 and 4096 characters. It is defined in the file
		Format:
		<cpu number>,...,<cpu number>
		or
		<cpu number>-<cpu number> (must be a positive range in ascending order)
		<cpu number>-<cpu number>
		(must be a positive range in ascending order)
		or a mixture
		<cpu number>,...,<cpu number>-<cpu number>

		This option can be used to specify one or more CPUs
		to isolate from the general SMP balancing and scheduling
		algorithms. The only way to move a process onto or off
		an "isolated" CPU is via the CPU affinity syscalls.
		algorithms. You can move a process onto or off an
		"isolated" CPU via the CPU affinity syscalls or cpuset.
		<cpu number> begins at 0 and the maximum value is
		"number of CPUs in system - 1".

		@@ -1470,8 +1472,6 @@ and is between 256 and 4096 characters. It is defined in the file
		Valid arguments: on, off
		Default: on

		noirqbalance [X86-32,SMP,KNL] Disable kernel irq balancing

		noirqdebug [X86-32] Disables the code which attempts to detect and
		disable unhandled interrupt sources.

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -721,7 +721,7 @@ W: http://sourceforge.net/projects/acpi4asus
		W: http://xf.iksaif.net/acpi4asus
		S: Maintained

		ASYNCHRONOUS TRANSFERS/TRANSFORMS API
		ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
		P: Dan Williams
		M: dan.j.williams@intel.com
		P: Maciej Sosnowski