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

Commit 2c33ce00 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge Linus master into drm-next 



The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents cec32a47 09d51602

.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

+21 −0
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/
@@ -3004,6 +3012,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

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

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# Note: This documents additional properties of any device beyond what

# is documented in Documentation/sysfs-rules.txt



What:		/sys/devices/*/of_path

Date:		February 2015

Contact:	Device Tree mailing list <devicetree@vger.kernel.org>

Description:

		Any device associated with a device-tree node will have

		an of_path symlink pointing to the corresponding device

		node in /sys/firmware/devicetree/