Commit ec3b34e1 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics',... 

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

Conflicts:
	drivers/hid/wacom_wac.c
parents 817a3125 3e48138c 181a8b91 81bb773f 10e87dc4 30ee72f0 6e5e9a06 b2723eb7 2a6cdbdd

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
*.order

*.elf

*.bin

*.tar

*.gz

*.bz2

*.lzma

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ Rajesh Shah <rajesh.shah@intel.com> 
Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Rémi Denis-Courmont <rdenis@simphalempin.com>

Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

CREDITS

+28 −0
Original line number Diff line number Diff line
@@ -508,6 +508,10 @@ E: paul@paulbristow.net 
W: http://paulbristow.net/linux/idefloppy.html

D: Maintainer of IDE/ATAPI floppy driver



N: Stefano Brivio

E: stefano.brivio@polimi.it

D: Broadcom B43 driver



N: Dominik Brodowski

E: linux@brodo.de

W: http://www.brodo.de/
@@ -2045,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver 
S: Gurgaon, India

S: Kuala Lumpur, Malaysia



N: Mohit Kumar

D: ST Microelectronics SPEAr13xx PCI host bridge driver

D: Synopsys Designware PCI host bridge driver



N: Gabor Kuti

M: seasons@falcon.sch.bme.hu

M: seasons@makosteszta.sote.hu
@@ -3008,6 +3016,19 @@ W: http://www.qsl.net/dl1bke/ 
D: Generic Z8530 driver, AX.25 DAMA slave implementation

D: Several AX.25 hacks



N: Ricardo Ribalda Delgado

E: ricardo.ribalda@gmail.com

W: http://ribalda.com

D: PLX USB338x driver

D: PCA9634 driver

D: Option GTM671WFS

D: Fintek F81216A

D: Various kernel hacks

S: Qtechnology A/S

S: Valby Langgade 142

S: 2500 Valby

S: Denmark



N: Francois-Rene Rideau

E: fare@tunes.org

W: http://www.tunes.org/~fare
@@ -3688,6 +3709,13 @@ N: Dirk Verworner 
D: Co-author of German book ``Linux-Kernel-Programmierung''

D: Co-founder of Berlin Linux User Group



N: Andrew Victor

E: linux@maxim.org.za

W: http://maxim.org.za/at91_26.html

D: First maintainer of Atmel ARM-based SoC, aka AT91

D: Introduced support for at91rm9200, the first chip of AT91 family

S: South Africa



N: Riku Voipio

E: riku.voipio@iki.fi

D: Author of PCA9532 LED and Fintek f75375s hwmon driver

Documentation/ABI/obsolete/sysfs-block-zram

0 → 100644
+119 −0
Original line number Diff line number Diff line 
What:		/sys/block/zram<id>/num_reads

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The num_reads file is read-only and specifies the number of

		reads (failed or successful) done on this device.

		Now accessible via zram<id>/stat node.



What:		/sys/block/zram<id>/num_writes

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The num_writes file is read-only and specifies the number of

		writes (failed or successful) done on this device.

		Now accessible via zram<id>/stat node.



What:		/sys/block/zram<id>/invalid_io

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The invalid_io file is read-only and specifies the number of

		non-page-size-aligned I/O requests issued to this device.

		Now accessible via zram<id>/io_stat node.



What:		/sys/block/zram<id>/failed_reads

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The failed_reads file is read-only and specifies the number of

		failed reads happened on this device.

		Now accessible via zram<id>/io_stat node.



What:		/sys/block/zram<id>/failed_writes

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The failed_writes file is read-only and specifies the number of

		failed writes happened on this device.

		Now accessible via zram<id>/io_stat node.



What:		/sys/block/zram<id>/notify_free

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The notify_free file is read-only. Depending on device usage

		scenario it may account a) the number of pages freed because

		of swap slot free notifications or b) the number of pages freed

		because of REQ_DISCARD requests sent by bio. The former ones

		are sent to a swap block device when a swap slot is freed, which

		implies that this disk is being used as a swap disk. The latter

		ones are sent by filesystem mounted with discard option,

		whenever some data blocks are getting discarded.

		Now accessible via zram<id>/io_stat node.



What:		/sys/block/zram<id>/zero_pages

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The zero_pages file is read-only and specifies number of zero

		filled pages written to this disk. No memory is allocated for

		such pages.

		Now accessible via zram<id>/mm_stat node.



What:		/sys/block/zram<id>/orig_data_size

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The orig_data_size file is read-only and specifies uncompressed

		size of data stored in this disk. This excludes zero-filled

		pages (zero_pages) since no memory is allocated for them.

		Unit: bytes

		Now accessible via zram<id>/mm_stat node.



What:		/sys/block/zram<id>/compr_data_size

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The compr_data_size file is read-only and specifies compressed

		size of data stored in this disk. So, compression ratio can be

		calculated using orig_data_size and this statistic.

		Unit: bytes

		Now accessible via zram<id>/mm_stat node.



What:		/sys/block/zram<id>/mem_used_total

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The mem_used_total file is read-only and specifies the amount

		of memory, including allocator fragmentation and metadata

		overhead, allocated for this disk. So, allocator space

		efficiency can be calculated using compr_data_size and this

		statistic.

		Unit: bytes

		Now accessible via zram<id>/mm_stat node.



What:		/sys/block/zram<id>/mem_used_max

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The mem_used_max file is read/write and specifies the amount

		of maximum memory zram have consumed to store compressed data.

		For resetting the value, you should write "0". Otherwise,

		you could see -EINVAL.

		Unit: bytes

		Downgraded to write-only node: so it's possible to set new

		value only; its current value is stored in zram<id>/mm_stat

		node.



What:		/sys/block/zram<id>/mem_limit

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The mem_limit file is read/write and specifies the maximum

		amount of memory ZRAM can use to store the compressed data.

		The limit could be changed in run time and "0" means disable

		the limit.  No limit is the initial state.  Unit: bytes

		Downgraded to write-only node: so it's possible to set new

		value only; its current value is stored in zram<id>/mm_stat

		node.

Documentation/ABI/testing/sysfs-block-dm

+22 −0
Original line number Diff line number Diff line
@@ -23,3 +23,25 @@ Description: Device-mapper device suspend state. 
		Contains the value 1 while the device is suspended.

		Otherwise it contains 0. Read-only attribute.

Users:		util-linux, device-mapper udev rules



What:		/sys/block/dm-<num>/dm/rq_based_seq_io_merge_deadline

Date:		March 2015

KernelVersion:	4.1

Contact:	dm-devel@redhat.com

Description:	Allow control over how long a request that is a

		reasonable merge candidate can be queued on the request

		queue.  The resolution of this deadline is in

		microseconds (ranging from 1 to 100000 usecs).

		Setting this attribute to 0 (the default) will disable

		request-based DM's merge heuristic and associated extra

		accounting.  This attribute is not applicable to

		bio-based DM devices so it will only ever report 0 for

		them.



What:		/sys/block/dm-<num>/dm/use_blk_mq

Date:		March 2015

KernelVersion:	4.1

Contact:	dm-devel@redhat.com

Description:	Request-based Device-mapper blk-mq I/O path mode.

		Contains the value 1 if the device is using blk-mq.

		Otherwise it contains 0. Read-only attribute.