Commit cc11f372 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'master' into staging-next 



We need the network changes in staging-next in order to be able to fix
up the rtl8821ae driver to build properly.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 5b4af8b6 77d143de

Documentation/ABI/testing/configfs-usb-gadget-ffs

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/ffs.name

Date:		Nov 2013

KenelVersion:	3.13

Description:	The purpose of this directory is to create and remove it.



		A corresponding USB function instance is created/removed.

		There are no attributes here.



		All parameters are set through FunctionFS.

Documentation/ABI/testing/configfs-usb-gadget-loopback

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/Loopback.name

Date:		Nov 2013

KenelVersion:	3.13

Description:

		The attributes:



		qlen		- depth of loopback queue

		bulk_buflen	- buffer length

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/SourceSink.name

Date:		Nov 2013

KenelVersion:	3.13

Description:

		The attributes:



		pattern		- 0 (all zeros), 1 (mod63), 2 (none)

		isoc_interval	- 1..16

		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)

		isoc_mult	- 0..2 (hs/ss only)

		isoc_maxburst	- 0..15 (ss only)

		qlen		- buffer length

Documentation/ABI/testing/debugfs-driver-genwqe

0 → 100644
+91 −0
Original line number Diff line number Diff line 
What:           /sys/kernel/debug/genwqe/genwqe<n>_card/ddcb_info

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    DDCB queue dump used for debugging queueing problems.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_regs

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump of the current error registers.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid0

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID0 (unit id 0).

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid1

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID1.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/curr_dbg_uid2

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID2.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_regs

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump of the error registers before the last reset of

                the card occured.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid0

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID0 before card was reset.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid1

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID1 before card was reset.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid2

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Internal chip state of UID2 before card was reset.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/info

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Comprehensive summary of bitstream version and software

                version. Used bitstream and bitstream clocking information.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/err_inject

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Possibility to inject error cases to ensure that the drivers

                error handling code works well.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/vf<0..14>_jobtimeout_msec

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Default VF timeout 250ms. Testing might require 1000ms.

                Using 0 will use the cards default value (whatever that is).



                The timeout depends on the max number of available cards

                in the system and the maximum allowed queue size.



                The driver ensures that the settings are done just before

                the VFs get enabled. Changing the timeouts in flight is not

                possible.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/jobtimer

Date:           Oct 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump job timeout register values for PF and VFs.

                Only available for PF.



What:           /sys/kernel/debug/genwqe/genwqe<n>_card/queue_working_time

Date:           Dec 2013

Contact:        haver@linux.vnet.ibm.com

Description:    Dump queue working time register values for PF and VFs.

                Only available for PF.

Documentation/ABI/testing/sysfs-bus-pci

+4 −7
Original line number Diff line number Diff line
@@ -70,18 +70,15 @@ Date: September, 2011 
Contact:	Neil Horman <nhorman@tuxdriver.com>

Description:

		The /sys/devices/.../msi_irqs directory contains a variable set

		of sub-directories, with each sub-directory being named after a

		corresponding msi irq vector allocated to that device.  Each

		numbered sub-directory N contains attributes of that irq.

		Note that this directory is not created for device drivers which

		do not support msi irqs

		of files, with each file being named after a corresponding msi

		irq vector allocated to that device.



What:		/sys/bus/pci/devices/.../msi_irqs/<N>/mode

What:		/sys/bus/pci/devices/.../msi_irqs/<N>

Date:		September 2011

Contact:	Neil Horman <nhorman@tuxdriver.com>

Description:

		This attribute indicates the mode that the irq vector named by

		the parent directory is in (msi vs. msix)

		the file is in (msi vs. msix)



What:		/sys/bus/pci/devices/.../remove

Date:		January 2009