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

Commit 206c59d1 authored by Johannes Berg's avatar Johannes Berg
Browse files

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



Merge back net-next to get wireless driver changes (from Kalle)
to be able to create the API change across all trees properly.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 5ec596c4 c3eee1fb
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver
S: Gurgaon, India
S: Kuala Lumpur, Malaysia

N: Mohit Kumar
D: ST Microelectronics SPEAr13xx PCI host bridge driver
D: Synopsys Designware PCI host bridge driver

N: Gabor Kuti
M: seasons@falcon.sch.bme.hu
M: seasons@makosteszta.sote.hu
@@ -3705,6 +3709,13 @@ N: Dirk Verworner
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group

N: Andrew Victor
E: linux@maxim.org.za
W: http://maxim.org.za/at91_26.html
D: First maintainer of Atmel ARM-based SoC, aka AT91
D: Introduced support for at91rm9200, the first chip of AT91 family
S: South Africa

N: Riku Voipio
E: riku.voipio@iki.fi
D: Author of PCA9532 LED and Fintek f75375s hwmon driver
+22 −0
Original line number Diff line number Diff line
@@ -23,3 +23,25 @@ Description: Device-mapper device suspend state.
		Contains the value 1 while the device is suspended.
		Otherwise it contains 0. Read-only attribute.
Users:		util-linux, device-mapper udev rules

What:		/sys/block/dm-<num>/dm/rq_based_seq_io_merge_deadline
Date:		March 2015
KernelVersion:	4.1
Contact:	dm-devel@redhat.com
Description:	Allow control over how long a request that is a
		reasonable merge candidate can be queued on the request
		queue.  The resolution of this deadline is in
		microseconds (ranging from 1 to 100000 usecs).
		Setting this attribute to 0 (the default) will disable
		request-based DM's merge heuristic and associated extra
		accounting.  This attribute is not applicable to
		bio-based DM devices so it will only ever report 0 for
		them.

What:		/sys/block/dm-<num>/dm/use_blk_mq
Date:		March 2015
KernelVersion:	4.1
Contact:	dm-devel@redhat.com
Description:	Request-based Device-mapper blk-mq I/O path mode.
		Contains the value 1 if the device is using blk-mq.
		Otherwise it contains 0. Read-only attribute.
+8 −0
Original line number Diff line number Diff line
What:		/sys/bus/pci/drivers/janz-cmodio/.../modulbus_number
Date:		May 2010
KernelVersion:	2.6.35
Contact:	Ira W. Snyder <ira.snyder@gmail.com>
Description:
		Value representing the HEX switch S2 of the janz carrier board CMOD-IO or CAN-PCI2

		Read-only: value of the configuration switch (0..15)
+10 −0
Original line number Diff line number Diff line
@@ -222,3 +222,13 @@ Description:
		The number of blocks that are marked as reserved, if any, in
		this partition. These are typically used to store the in-flash
		bad block table (BBT).

What:		/sys/class/mtd/mtdX/offset
Date:		March 2015
KernelVersion:	4.1
Contact:	linux-mtd@lists.infradead.org
Description:
		For a partition, the offset of that partition from the start
		of the master device in bytes. This attribute is absent on
		main devices, so it can be used to distinguish between
		partitions and devices that aren't partitions.
+19 −0
Original line number Diff line number Diff line
@@ -39,6 +39,25 @@ Description:
		Format is a string, e.g: 00:11:22:33:44:55 for an Ethernet MAC
		address.

What:		/sys/class/net/<bridge iface>/bridge/group_fwd_mask
Date:		January 2012
KernelVersion:	3.2
Contact:	netdev@vger.kernel.org
Description:
		Bitmask to allow forwarding of link local frames with address
		01-80-C2-00-00-0X on a bridge device. Only values that set bits
		not matching BR_GROUPFWD_RESTRICTED in net/bridge/br_private.h
		allowed.
		Default value 0 does not forward any link local frames.

		Restricted bits:
		0: 01-80-C2-00-00-00 Bridge Group Address used for STP
		1: 01-80-C2-00-00-01 (MAC Control) 802.3 used for MAC PAUSE
		2: 01-80-C2-00-00-02 (Link Aggregation) 802.3ad

		Any values not setting these bits can be used. Take special
		care when forwarding control frames e.g. 802.1X-PAE or LLDP.

What:		/sys/class/net/<iface>/broadcast
Date:		April 2005
KernelVersion:	2.6.12
Loading