Merge commit 'v3.2-rc5' into sched/core (6a54aebf) · Commits · e / devices / android_kernel_oneplus_sm8150

CREDITS

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -688,10 +688,13 @@ S: Oxfordshire, UK.

	N: Kees Cook		N: Kees Cook
	E: kees@outflux.net		E: kees@outflux.net
	W: http://outflux.net/		E: kees@ubuntu.com
	P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30 1975 1FFF 4BA9 1706 3E6D		E: keescook@chromium.org
	D: Minor updates to SCSI types, added /proc/pid/maps protection		W: http://outflux.net/blog/
			P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E 6E13 8972 F4DF DC6D C026
			D: Various security things, bug fixes, and documentation.
	S: (ask for current address)		S: (ask for current address)
			S: Portland, Oregon
	S: USA		S: USA

	N: Robin Cornelius		N: Robin Cornelius

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -206,16 +206,3 @@ Description:
	when a discarded area is read the discard_zeroes_data		when a discarded area is read the discard_zeroes_data
	parameter will be set to one. Otherwise it will be 0 and		parameter will be set to one. Otherwise it will be 0 and
	the result of reading a discarded area is undefined.		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.

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -520,6 +520,11 @@ Here's a description of the fields of <varname>struct uio_mem</varname>:
	</para>		</para>

	<itemizedlist>		<itemizedlist>
			<listitem><para>
			<varname>const char *name</varname>: Optional. Set this to help identify
			the memory region, it will show up in the corresponding sysfs node.
			</para></listitem>

	<listitem><para>		<listitem><para>
	<varname>int memtype</varname>: Required if the mapping is used. Set this to		<varname>int memtype</varname>: Required if the mapping is used. Set this to
	<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your		<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
	@@ -553,7 +558,7 @@ instead to remember such an address.
	</itemizedlist>		</itemizedlist>

	<para>		<para>
	Please do not touch the <varname>kobj</varname> element of		Please do not touch the <varname>map</varname> element of
	<varname>struct uio_mem</varname>! It is used by the UIO framework		<varname>struct uio_mem</varname>! It is used by the UIO framework
	to set up sysfs files for this mapping. Simply leave it alone.		to set up sysfs files for this mapping. Simply leave it alone.
	</para>		</para>

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -98,14 +98,12 @@ You must enable "SCSI tape drive support for Smart Array 5xxx" and
	"SCSI support" in your kernel configuration to be able to use SCSI		"SCSI support" in your kernel configuration to be able to use SCSI
	tape drives with your Smart Array 5xxx controller.		tape drives with your Smart Array 5xxx controller.

	Additionally, note that the driver will not engage the SCSI core at init		Additionally, note that the driver will engage the SCSI core at init
	time. The driver must be directed to dynamically engage the SCSI core via		time if any tape drives or medium changers are detected. The driver may
	the /proc filesystem entry which the "block" side of the driver creates as		also be directed to dynamically engage the SCSI core via the /proc filesystem
	/proc/driver/cciss/cciss* at runtime. This is because at driver init time,		entry which the "block" side of the driver creates as
	the SCSI core may not yet be initialized (because the driver is a block		/proc/driver/cciss/cciss* at runtime. This is best done via a script.
	driver) and attempting to register it with the SCSI core in such a case
	would cause a hang. This is best done via an initialization script
	(typically in /etc/init.d, but could vary depending on distribution).
	For example:		For example:

	for x in /proc/driver/cciss/cciss[0-9]*		for x in /proc/driver/cciss/cciss[0-9]*

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ qcom Qualcomm, Inc.
	ramtron Ramtron International		ramtron Ramtron International
	samsung Samsung Semiconductor		samsung Samsung Semiconductor
	schindler Schindler		schindler Schindler
			sil Silicon Image
	simtek		simtek
	sirf SiRF Technology, Inc.		sirf SiRF Technology, Inc.
	stericsson ST-Ericsson		stericsson ST-Ericsson