Merge branch 'master' into mm-stable (12b98f33) · Commits · EulixOS / Software / Kernel

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		.o.
		*.patch
		*.rmeta
		*.rpm
		*.rsi
		*.s
		*.so

Documentation/ABI/testing/debugfs-pktcdvd

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/debug/pktcdvd/pktcdvd[0-7]
		Date: Oct. 2006
		KernelVersion: 2.6.20
		Contact: Thomas Maier <balagi@justmail.de>
		Description:

		The pktcdvd module (packet writing driver) creates
		these files in debugfs:

		/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/

		==== ====== ====================================
		info 0444 Lots of driver statistics and infos.
		==== ====== ====================================

		Example::

		cat /sys/kernel/debug/pktcdvd/pktcdvd0/info

Documentation/ABI/testing/sysfs-class-pktcdvd

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		sysfs interface
		---------------
		The pktcdvd module (packet writing driver) creates the following files in the
		sysfs: (<devid> is in the format major:minor)

		What: /sys/class/pktcdvd/add
		What: /sys/class/pktcdvd/remove
		What: /sys/class/pktcdvd/device_map
		Date: Oct. 2006
		KernelVersion: 2.6.20
		Contact: Thomas Maier <balagi@justmail.de>
		Description:

		========== ==============================================
		add (WO) Write a block device id (major:minor) to
		create a new pktcdvd device and map it to the
		block device.

		remove (WO) Write the pktcdvd device id (major:minor)
		to remove the pktcdvd device.

		device_map (RO) Shows the device mapping in format:
		pktcdvd[0-7] <pktdevid> <blkdevid>
		========== ==============================================


		What: /sys/class/pktcdvd/pktcdvd[0-7]/dev
		What: /sys/class/pktcdvd/pktcdvd[0-7]/uevent
		Date: Oct. 2006
		KernelVersion: 2.6.20
		Contact: Thomas Maier <balagi@justmail.de>
		Description:
		dev: (RO) Device id

		uevent: (WO) To send a uevent


		What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_started
		What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_finished
		What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_written
		What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read
		What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read_gather
		What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/reset
		Date: Oct. 2006
		KernelVersion: 2.6.20
		Contact: Thomas Maier <balagi@justmail.de>
		Description:
		packets_started: (RO) Number of started packets.

		packets_finished: (RO) Number of finished packets.

		kb_written: (RO) kBytes written.

		kb_read: (RO) kBytes read.

		kb_read_gather: (RO) kBytes read to fill write packets.

		reset: (WO) Write any value to it to reset
		pktcdvd device statistic values, like
		bytes read/written.


		What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/size
		What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_off
		What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_on
		Date: Oct. 2006
		KernelVersion: 2.6.20
		Contact: Thomas Maier <balagi@justmail.de>
		Description:
		============== ================================================
		size (RO) Contains the size of the bio write queue.

		congestion_off (RW) If bio write queue size is below this mark,
		accept new bio requests from the block layer.

		congestion_on (RW) If bio write queue size is higher as this
		mark, do no longer accept bio write requests
		from the block layer and wait till the pktcdvd
		device has processed enough bio's so that bio
		write queue size is below congestion off mark.
		A value of <= 0 disables congestion control.
		============== ================================================


		Example:
		--------
		To use the pktcdvd sysfs interface directly, you can do::

		# create a new pktcdvd device mapped to /dev/hdc
		echo "22:0" >/sys/class/pktcdvd/add
		cat /sys/class/pktcdvd/device_map
		# assuming device pktcdvd0 was created, look at stat's
		cat /sys/class/pktcdvd/pktcdvd0/stat/kb_written
		# print the device id of the mapped block device
		fgrep pktcdvd0 /sys/class/pktcdvd/device_map
		# remove device, using pktcdvd0 device id 253:0
		echo "253:0" >/sys/class/pktcdvd/remove

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

+3 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@ properties:
		clock-names:
		const: stmmaceth

		phy-supply:
		description: PHY regulator

		syscon:
		$ref: /schemas/types.yaml#/definitions/phandle
		description:

Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml

+26 −4

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@ description: \|
		8k has a second unit which provides an interface with the xMDIO bus. This
		driver handles these interfaces.

		allOf:
		- $ref: "mdio.yaml#"

		properties:
		compatible:
		enum:
		@@ -39,13 +36,38 @@ required:
		- compatible
		- reg

		allOf:
		- $ref: mdio.yaml#

		- if:
		required:
		- interrupts

		then:
		properties:
		reg:
		items:
		- items:
		- $ref: /schemas/types.yaml#/definitions/cell
		- const: 0x84

		else:
		properties:
		reg:
		items:
		- items:
		- $ref: /schemas/types.yaml#/definitions/cell
		- enum:
		- 0x4
		- 0x10

		unevaluatedProperties: false

		examples:
		- \|
		mdio@d0072004 {
		compatible = "marvell,orion-mdio";
		reg = <0xd0072004 0x4>;
		reg = <0xd0072004 0x84>;
		#address-cells = <1>;
		#size-cells = <0>;
		interrupts = <30>;