Commit f89e0dd9 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v3.15-rc1' into for-3.16/core 

We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
parents 21f9fcd8 c9eaa447

Documentation/ABI/testing/sysfs-block-zram

+30 −9
Original line number Diff line number Diff line
@@ -43,6 +43,36 @@ 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>

Description:

		The max_comp_streams file is read-write and specifies the

		number of backend's zcomp_strm compression streams (number of

		concurrent compress operations).



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

Date:		February 2014

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

Description:

		The comp_algorithm file is read-write and lets to show

		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>
@@ -53,15 +83,6 @@ Description: 
		is freed. This statistic is applicable only when this disk is

		being used as a swap disk.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

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

		discard requests received by this device. These requests

		provide information to block device regarding blocks which are

		no longer used by filesystem.



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

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Documentation/ABI/testing/sysfs-devices-power

+30 −16
Original line number Diff line number Diff line
@@ -83,8 +83,10 @@ Contact: Rafael J. Wysocki <rjw@rjwysocki.net> 
Description:

		The /sys/devices/.../wakeup_count attribute contains the number

		of signaled wakeup events associated with the device.  This

		attribute is read-only.  If the device is not enabled to wake up

		attribute is read-only.  If the device is not capable to wake up

		the system from sleep states, this attribute is not present.

		If the device is not enabled to wake up the system from sleep

		states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_active_count

Date:		September 2010
@@ -93,8 +95,10 @@ Description: 
		The /sys/devices/.../wakeup_active_count attribute contains the

		number of times the processing of wakeup events associated with

		the device was completed (at the kernel level).  This attribute

		is read-only.  If the device is not enabled to wake up the

		system from sleep states, this attribute is not present.

		is read-only.  If the device is not capable to wake up the

		system from sleep states, this attribute is not present.  If

		the device is not enabled to wake up the system from sleep

		states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_abort_count

Date:		February 2012
@@ -104,8 +108,9 @@ Description: 
		number of times the processing of a wakeup event associated with

		the device might have aborted system transition into a sleep

		state in progress.  This attribute is read-only.  If the device

		is not enabled to wake up the system from sleep states, this

		attribute is not present.

		is not capable to wake up the system from sleep states, this

		attribute is not present.  If the device is not enabled to wake

		up the system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_expire_count

Date:		February 2012
@@ -114,8 +119,10 @@ Description: 
		The /sys/devices/.../wakeup_expire_count attribute contains the

		number of times a wakeup event associated with the device has

		been reported with a timeout that expired.  This attribute is

		read-only.  If the device is not enabled to wake up the system

		from sleep states, this attribute is not present.

		read-only.  If the device is not capable to wake up the system

		from sleep states, this attribute is not present.  If the

		device is not enabled to wake up the system from sleep states,

		this attribute is empty.



What:		/sys/devices/.../power/wakeup_active

Date:		September 2010
@@ -124,8 +131,10 @@ Description: 
		The /sys/devices/.../wakeup_active attribute contains either 1,

		or 0, depending on whether or not a wakeup event associated with

		the device is being processed (1).  This attribute is read-only.

		If the device is not enabled to wake up the system from sleep

		states, this attribute is not present.

		If the device is not capable to wake up the system from sleep

		states, this attribute is not present.  If the device is not

		enabled to wake up the system from sleep states, this attribute

		is empty.



What:		/sys/devices/.../power/wakeup_total_time_ms

Date:		September 2010
@@ -134,8 +143,9 @@ Description: 
		The /sys/devices/.../wakeup_total_time_ms attribute contains

		the total time of processing wakeup events associated with the

		device, in milliseconds.  This attribute is read-only.  If the

		device is not enabled to wake up the system from sleep states,

		this attribute is not present.

		device is not capable to wake up the system from sleep states,

		this attribute is not present.  If the device is not enabled to

		wake up the system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_max_time_ms

Date:		September 2010
@@ -144,8 +154,10 @@ Description: 
		The /sys/devices/.../wakeup_max_time_ms attribute contains

		the maximum time of processing a single wakeup event associated

		with the device, in milliseconds.  This attribute is read-only.

		If the device is not enabled to wake up the system from sleep

		states, this attribute is not present.

		If the device is not capable to wake up the system from sleep

		states, this attribute is not present.  If the device is not

		enabled to wake up the system from sleep states, this attribute

		is empty.



What:		/sys/devices/.../power/wakeup_last_time_ms

Date:		September 2010
@@ -156,7 +168,8 @@ Description: 
		signaling the last wakeup event associated with the device, in

		milliseconds.  This attribute is read-only.  If the device is

		not enabled to wake up the system from sleep states, this

		attribute is not present.

		attribute is not present.  If the device is not enabled to wake

		up the system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_prevent_sleep_time_ms

Date:		February 2012
@@ -165,9 +178,10 @@ Description: 
		The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute

		contains the total time the device has been preventing

		opportunistic transitions to sleep states from occurring.

		This attribute is read-only.  If the device is not enabled to

		This attribute is read-only.  If the device is not capable to

		wake up the system from sleep states, this attribute is not

		present.

		present.  If the device is not enabled to wake up the system

		from sleep states, this attribute is empty.



What:		/sys/devices/.../power/autosuspend_delay_ms

Date:		September 2010

Documentation/ABI/testing/sysfs-fs-f2fs

+12 −0
Original line number Diff line number Diff line
@@ -55,3 +55,15 @@ Date: January 2014 
Contact:	"Jaegeuk Kim" <jaegeuk.kim@samsung.com>

Description:

		 Controls the number of trials to find a victim segment.



What:		/sys/fs/f2fs/<disk>/dir_level

Date:		March 2014

Contact:	"Jaegeuk Kim" <jaegeuk.kim@samsung.com>

Description:

		 Controls the directory level for large directory.



What:		/sys/fs/f2fs/<disk>/ram_thresh

Date:		March 2014

Contact:	"Jaegeuk Kim" <jaegeuk.kim@samsung.com>

Description:

		 Controls the memory footprint used by f2fs.

Documentation/ABI/testing/sysfs-module

+1 −0
Original line number Diff line number Diff line
@@ -49,3 +49,4 @@ Description: Module taint flags: 
			O - out-of-tree module

			F - force-loaded module

			C - staging driver module

			E - unsigned module

Documentation/DocBook/Makefile

+7 −18
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ 
	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml drm.xml media_api.xml w1.xml



include $(srctree)/Documentation/DocBook/media/Makefile

include Documentation/DocBook/media/Makefile



###

# The build process is as follows (targets):
@@ -36,6 +36,7 @@ PS_METHOD = $(prefer-db2x) 
# The targets that may be used.

PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs



targets += $(DOCBOOKS)

BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))

xmldocs: $(BOOKS)

sgmldocs: xmldocs
@@ -58,14 +59,14 @@ mandocs: $(MAN) 


installmandocs: mandocs

	mkdir -p /usr/local/man/man9/

	install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/

	install $(obj)/man/*.9.gz /usr/local/man/man9/



###

#External programs used

KERNELDOC = $(srctree)/scripts/kernel-doc

DOCPROC   = $(objtree)/scripts/docproc



XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl

XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl

XMLTOFLAGS += --skip-validation



###
@@ -87,21 +88,9 @@ define rule_docproc 
        ) > $(dir $@).$(notdir $@).cmd

endef



%.xml: %.tmpl FORCE

%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) FORCE

	$(call if_changed_rule,docproc)



###

#Read in all saved dependency files

cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd))



ifneq ($(cmd_files),)

  include $(cmd_files)

endif



###

# Changes in kernel-doc force a rebuild of all documentation

$(BOOKS): $(KERNELDOC)



# Tell kbuild to always build the programs

always := $(hostprogs-y)
@@ -139,7 +128,7 @@ quiet_cmd_db2pdf = PDF $@ 




index = index.html

main_idx = Documentation/DocBook/$(index)

main_idx = $(obj)/$(index)

build_main_index = rm -rf $(main_idx); \

		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \

		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \