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

Commit 760a52e8 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'wireless-next/master' into mac80211-next 



This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 0395442a 47b6308b

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ local_ops.txt 
	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

locking/

	- directory with info about kernel locking primitives

lockstat.txt

	- info on collecting statistics on locks (and contention).

lockup-watchdogs.txt

Documentation/ABI/stable/sysfs-devices-node

+0 −8
Original line number Diff line number Diff line
@@ -85,14 +85,6 @@ Description: 
		will be compacted. When it completes, memory will be freed

		into blocks which have as many contiguous pages as possible



What:		/sys/devices/system/node/nodeX/scan_unevictable_pages

Date:		October 2008

Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>

Description:

		When set, it triggers scanning the node's unevictable lists

		and move any pages that have become evictable onto the respective

		zone's inactive list. See mm/vmscan.c



What:		/sys/devices/system/node/nodeX/hugepages/hugepages-<size>/

Date:		December 2009

Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>

Documentation/ABI/testing/sysfs-block

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ Description: 
		512 bytes of data.





What:		/sys/block/<disk>/integrity/device_is_integrity_capable

Date:		July 2014

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Indicates whether a storage device is capable of storing

		integrity metadata. Set if the device is T10 PI-capable.





What:		/sys/block/<disk>/integrity/write_generate

Date:		June 2008

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Documentation/ABI/testing/sysfs-block-zram

+27 −5
Original line number Diff line number Diff line
@@ -77,11 +77,14 @@ What: /sys/block/zram<id>/notify_free 
Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

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

		swap slot free notifications received by this device. These

		notifications are sent to a swap block device when a swap slot

		is freed. This statistic is applicable only when this disk is

		being used as a swap disk.

		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
@@ -119,3 +122,22 @@ Description: 
		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.

		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