Merge branch 'next' into for-linus (01b944fe) · Commits · e / devices / android_kernel_fairphone_FP5

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		*.order
		*.elf
		*.bin
		*.tar
		*.gz
		*.bz2
		*.lzma

.mailmap

+8 −1

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		Mitesh shah <mshah@teja.com>
		Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
		Morten Welinder <terra@gnome.org>
		Morten Welinder <welinder@anemone.rentec.com>
		Morten Welinder <welinder@darter.rentec.com>
		@@ -95,11 +96,14 @@ Patrick Mochel <mochel@digitalimplant.org>
		Peter A Jonsson <pj@ludd.ltu.se>
		Peter Oruba <peter@oruba.de>
		Peter Oruba <peter.oruba@amd.com>
		Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
		Praveen BP <praveenbp@ti.com>
		Rajesh Shah <rajesh.shah@intel.com>
		Ralf Baechle <ralf@linux-mips.org>
		Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
		Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
		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>
		@@ -112,6 +116,7 @@ Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>
		Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
		Sumit Semwal <sumit.semwal@ti.com>
		Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		@@ -121,7 +126,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
		Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>

CREDITS

+36 −5

Original line number	Diff line number	Diff line
		@@ -187,6 +187,10 @@ N: Krishna Balasubramanian
		E: balasub@cis.ohio-state.edu
		D: Wrote SYS V IPC (part of standard kernel since 0.99.10)

		N: Chris Ball
		E: chris@printf.net
		D: Former maintainer of the MMC/SD/SDIO subsystem.

		N: Dario Ballabio
		E: ballabio_dario@emc.com
		E: dario.ballabio@tiscalinet.it
		@@ -504,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/
		@@ -2041,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
		@@ -2728,6 +2740,10 @@ S: C/ Mieses 20, 9-B
		S: Valladolid 47009
		S: Spain

		N: Jens Osterkamp
		E: jens@de.ibm.com
		D: Maintainer of Spidernet network driver for Cell

		N: Gadi Oxman
		E: gadio@netvision.net.il
		D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
		@@ -3004,6 +3020,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
		@@ -3194,11 +3223,6 @@ N: Dipankar Sarma
		E: dipankar@in.ibm.com
		D: RCU

		N: Yoshinori Sato
		E: ysato@users.sourceforge.jp
		D: uClinux for Renesas H8/300 (H8300)
		D: http://uclinux-h8.sourceforge.jp/

		N: Hannu Savolainen
		E: hannu@opensound.com
		D: Maintainer of the sound drivers until 2.1.x days.
		@@ -3684,6 +3708,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/stable/sysfs-bus-w1

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/w1/devices/.../w1_master_timeout_us
		Date: April 2015
		Contact: Dmitry Khromov <dk@icelogic.net>
		Description: Bus scanning interval, microseconds component.
		Some of 1-Wire devices commonly associated with physical access
		control systems are attached/generate presence for as short as
		100 ms - hence the tens-to-hundreds milliseconds scan intervals
		are required.
		see Documentation/w1/w1.generic for detailed information.
		Users: any user space application which wants to know bus scanning
		interval