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

Commit 0871d5a6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates 



 Conflicts:
	arch/x86/xen/setup.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e22af0be 2d6be4ab

CREDITS

+2 −3
Original line number Diff line number Diff line
@@ -2478,12 +2478,11 @@ S: D-90453 Nuernberg 
S: Germany



N: Arnaldo Carvalho de Melo

E: acme@ghostprotocols.net

E: acme@kernel.org

E: arnaldo.melo@gmail.com

E: acme@redhat.com

W: http://oops.ghostprotocols.net:81/blog/

P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01

D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks

D: tools/, IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks

S: Brazil



N: Karsten Merker

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -270,8 +270,8 @@ m68k/ 
	- directory with info about Linux on Motorola 68k architecture.

mailbox.txt

	- How to write drivers for the common mailbox framework (IPC).

md-cluster.txt

	- info on shared-device RAID MD cluster.

md/

	- directory with info about Linux Software RAID

media/

	- info on media drivers: uAPI, kAPI and driver documentation.

memory-barriers.txt

Documentation/ABI/obsolete/sysfs-block-zram

deleted100644 → 0
+0 −119
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/configfs-rdma_cm

+8 −0
Original line number Diff line number Diff line
@@ -20,3 +20,11 @@ Description: RDMA-CM based connections from HCA <hca> at port <port-num> 
		will be initiated with this RoCE type as default.

		The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".

		This parameter has RW access.



What: 		/config/rdma_cm/<hca>/ports/<port-num>/default_roce_tos

Date: 		February 7, 2017

KernelVersion:  4.11.0

Description: 	RDMA-CM QPs from HCA <hca> at port <port-num>

		will be created with this TOS as default.

		This can be overridden by using the rdma_set_option API.

		The possible RoCE TOS values are 0-255.

Documentation/ABI/testing/sysfs-block-zram

+8 −93
Original line number Diff line number Diff line
@@ -22,41 +22,6 @@ Description: 
		device. The reset operation frees all the memory associated

		with this device.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

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

		reads (failed or successful) done on this device.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

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

		writes (failed or successful) done on this device.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

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

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



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

Date:		February 2014

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.



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

Date:		February 2014

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.



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

Date:		February 2014

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
@@ -73,74 +38,24 @@ Description: 
		available and selected compression algorithms, change

		compression algorithm selection.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

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.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

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.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

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



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

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



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

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



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

Date:		August 2014

Contact:	Minchan Kim <minchan@kernel.org>

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.

		The mem_used_max file is write-only and is used to reset

		the counter 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



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

Date:		August 2014

Contact:	Minchan Kim <minchan@kernel.org>

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

		The mem_limit file is write-only 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



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

Date:		August 2015