Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (e1d9d7b9) · Commits · 戴 / test

Documentation/ABI/stable/sysfs-driver-dma-ioatdma

+5 −5

Original line number	Diff line number	Diff line
		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL,
		DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: The number of descriptors active in the ring.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Descriptor ring size, total number of descriptors available.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Version of ioatdma device.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
		Date: August 8, 2017
		KernelVersion: 4.14
		Contact: dmaengine@vger.kernel.org

Documentation/ABI/testing/sysfs-class-net

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ Description:
		When an interface is under test, it cannot be expected
		to pass packets as normal.

		What: /sys/clas/net/<iface>/duplex
		What: /sys/class/net/<iface>/duplex
		Date: October 2009
		KernelVersion: 2.6.33
		Contact: netdev@vger.kernel.org

Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml

+10 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,11 @@ description: \|
		\| \| vint \| bit \| \| 0 \|.....\|63\| vintx \|
		\| +--------------+ +------------+ \|
		\| \|
		\| Unmap \|
		\| +--------------+ \|
		Unmapped events ---->\| \| umapidx \|-------------------------> Globalevents
		\| +--------------+ \|
		\| \|
		+-----------------------------------------+

		Configuration of these Intmap registers that maps global events to vint is
		@@ -70,6 +75,11 @@ properties:
		- description: \|
		"limit" specifies the limit for translation

		ti,unmapped-event-sources:
		$ref: /schemas/types.yaml#definitions/phandle-array
		description:
		Array of phandles to DMA controllers where the unmapped events originate.

		required:
		- compatible
		- reg

Documentation/filesystems/ext4/journal.rst

+6 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,10 @@ which is 1024 bytes long:
		- s\_padding2
		-
		* - 0x54
		- \_\_be32
		- s\_num\_fc\_blocks
		- Number of fast commit blocks in the journal.
		* - 0x58
		- \_\_u32
		- s\_padding[42]
		-
		@@ -310,6 +314,8 @@ The journal incompat features are any combination of the following:
		- This journal uses v3 of the checksum on-disk format. This is the same as
		v2, but the journal block tag size is fixed regardless of the size of
		block numbers. (JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3)
		* - 0x20
		- Journal has fast commit blocks. (JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT)

		.. _jbd2_checksum_type:

Documentation/filesystems/ext4/super.rst

+7 −0

Original line number	Diff line number	Diff line
		@@ -596,6 +596,13 @@ following:
		- Sparse Super Block, v2. If this flag is set, the SB field s\_backup\_bgs
		points to the two block groups that contain backup superblocks
		(COMPAT\_SPARSE\_SUPER2).
		* - 0x400
		- Fast commits supported. Although fast commits blocks are
		backward incompatible, fast commit blocks are not always
		present in the journal. If fast commit blocks are present in
		the journal, JBD2 incompat feature
		(JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT) gets
		set (COMPAT\_FAST\_COMMIT).

		.. _super_incompat:

Admin message