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

Commit 47b64959 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.2-rc3 into usb-linus 



This pulls in the latest USB bugfixes and helps a few of the drivers
merge nicer in the future due to changes in both branches.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents 3af5154a caca6a03

.mailmap

+2 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Kay Sievers <kay.sievers@vrfy.org>

Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Koushik <raghavendra.koushik@neterion.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>

Mark Brown <broonie@sirena.org.uk>
@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de> 
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Documentation/ABI/testing/sysfs-block

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

Documentation/DocBook/drm.tmpl

+168 −140

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/DocBook/uio-howto.tmpl

+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>

Documentation/blockdev/cciss.txt

+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]*