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

Commit bae6692c authored by Luca Coelho's avatar Luca Coelho
Browse files

Merge tag 'mac80211-next-for-davem-2016-04-13' of... 

Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next into master

To synchronize with Kalle, here's just a big change that affects
all drivers - removing the duplicated enum ieee80211_band and
replacing it by enum nl80211_band. On top of that, just a small
documentation update.
parents 46167a8f 57fbcce3

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de> 
Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Christophe Ricard <christophe.ricard@gmail.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

Documentation/ABI/stable/firewire-cdev

+2 −1
Original line number Diff line number Diff line
@@ -100,4 +100,5 @@ Description: 


Users:		libraw1394

		libdc1394

		tools like jujuutils, fwhack, ...
 
		libhinawa

		tools like linux-firewire-utils, fwhack, ...

Documentation/ABI/stable/sysfs-fs-orangefs

0 → 100644
+87 −0
Original line number Diff line number Diff line 
What:			/sys/fs/orangefs/perf_counters/*

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			Counters and settings for various caches.

			Read only.





What:			/sys/fs/orangefs/perf_counter_reset

Date:			June 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			echo a 0 or a 1 into perf_counter_reset to

			reset all the counters in

			/sys/fs/orangefs/perf_counters

			except ones with PINT_PERF_PRESERVE set.





What:			/sys/fs/orangefs/perf_time_interval_secs

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			Length of perf counter intervals in

			seconds.





What:			/sys/fs/orangefs/perf_history_size

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			The perf_counters cache statistics have N, or

			perf_history_size, samples. The default is

			one.



			Every perf_time_interval_secs the (first)

			samples are reset.



			If N is greater than one, the "current" set

			of samples is reset, and the samples from the

			other N-1 intervals remain available.





What:			/sys/fs/orangefs/op_timeout_secs

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			Service operation timeout in seconds.





What:			/sys/fs/orangefs/slot_timeout_secs

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			"Slot" timeout in seconds. A "slot"

			is an indexed buffer in the shared

			memory segment used for communication

			between the kernel module and userspace.

			Slots are requested and waited for,

			the wait times out after slot_timeout_secs.





What:			/sys/fs/orangefs/acache/*

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			Attribute cache configurable settings.





What:			/sys/fs/orangefs/ncache/*

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			Name cache configurable settings.





What:			/sys/fs/orangefs/capcache/*

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			Capability cache configurable settings.





What:			/sys/fs/orangefs/ccache/*

Date:			Jun 2015

Contact:		Mike Marshall <hubcap@omnibond.com>

Description:

			Credential cache configurable settings.

Documentation/ABI/testing/sysfs-class-cxl

+5 −5
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ Description: read only 
                Decimal value of the Per Process MMIO space length.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<afu>m/pp_mmio_off

What:           /sys/class/cxl/<afu>m/pp_mmio_off (not in a guest)

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only
@@ -183,7 +183,7 @@ Description: read only 
                Identifies the revision level of the PSL.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/base_image

What:           /sys/class/cxl/<card>/base_image (not in a guest)

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only
@@ -193,7 +193,7 @@ Description: read only 
                during the initial program load.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/image_loaded

What:           /sys/class/cxl/<card>/image_loaded (not in a guest)

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only
@@ -201,7 +201,7 @@ Description: read only 
                onto the card.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/load_image_on_perst

What:           /sys/class/cxl/<card>/load_image_on_perst (not in a guest)

Date:           December 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read/write
@@ -224,7 +224,7 @@ Description: write only 
                to reload the FPGA depending on load_image_on_perst.

Users:		https://github.com/ibm-capi/libcxl



What:		/sys/class/cxl/<card>/perst_reloads_same_image

What:		/sys/class/cxl/<card>/perst_reloads_same_image (not in a guest)

Date:		July 2015

Contact:	linuxppc-dev@lists.ozlabs.org

Description:	read/write

Documentation/ABI/testing/sysfs-devices-system-cpu

+69 −0
Original line number Diff line number Diff line
@@ -271,3 +271,72 @@ Description: Parameters for the CPU cache attributes 
			- WriteBack: data is written only to the cache line and

				     the modified cache line is written to main

				     memory only when it is replaced



What:		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/turbo_stat

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/sub_turbo_stat

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/unthrottle

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/powercap

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/overtemp

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/supply_fault

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/overcurrent

		/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/occ_reset

Date:		March 2016

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

		Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>

Description:	POWERNV CPUFreq driver's frequency throttle stats directory and

		attributes



		'cpuX/cpufreq/throttle_stats' directory contains the CPU frequency

		throttle stat attributes for the chip. The throttle stats of a cpu

		is common across all the cpus belonging to a chip. Below are the

		throttle attributes exported in the 'throttle_stats' directory:



		- turbo_stat : This file gives the total number of times the max

		frequency is throttled to lower frequency in turbo (at and above

		nominal frequency) range of frequencies.



		- sub_turbo_stat : This file gives the total number of times the

		max frequency is throttled to lower frequency in sub-turbo(below

		nominal frequency) range of frequencies.



		- unthrottle : This file gives the total number of times the max

		frequency is unthrottled after being throttled.



		- powercap : This file gives the total number of times the max

		frequency is throttled due to 'Power Capping'.



		- overtemp : This file gives the total number of times the max

		frequency is throttled due to 'CPU Over Temperature'.



		- supply_fault : This file gives the total number of times the

		max frequency is throttled due to 'Power Supply Failure'.



		- overcurrent : This file gives the total number of times the

		max frequency is throttled due to 'Overcurrent'.



		- occ_reset : This file gives the total number of times the max

		frequency is throttled due to 'OCC Reset'.



		The sysfs attributes representing different throttle reasons like

		powercap, overtemp, supply_fault, overcurrent and occ_reset map to

		the reasons provided by OCC firmware for throttling the frequency.



What:		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/turbo_stat

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/sub_turbo_stat

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/unthrottle

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/powercap

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/overtemp

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/supply_fault

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/overcurrent

		/sys/devices/system/cpu/cpufreq/policyX/throttle_stats/occ_reset

Date:		March 2016

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

		Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>

Description:	POWERNV CPUFreq driver's frequency throttle stats directory and

		attributes



		'policyX/throttle_stats' directory and all the attributes are same as

		the /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats directory and

		attributes which give the frequency throttle information of the chip.