Commit 112e505a authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-next into drm-misc-next 



We need commit f8f6ae5d ("mm: always have io_remap_pfn_range() set
pgprot_decrypted()") to be able to merge Jason's cleanup patch.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents 55c8bcae 512bce50

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/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ BUILDDIR = $(obj)/output 
PDFLATEX      = xelatex

LATEXOPTS     = -interaction=batchmode



ifeq ($(KBUILD_VERBOSE),0)

SPHINXOPTS    += "-q"

endif



# User-friendly check for sphinx-build

HAVE_SPHINX := $(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi)

Documentation/admin-guide/LSM/SafeSetID.rst

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ for a UID/GID will prevent that UID/GID from obtaining auxiliary setid 
privileges, such as allowing a user to set up user namespace UID/GID mappings.



Note on GID policies and setgroups()

==================

====================================

In v5.9 we are adding support for limiting CAP_SETGID privileges as was done

previously for CAP_SETUID. However, for compatibility with common sandboxing

related code conventions in userspace, we currently allow arbitrary

Documentation/admin-guide/pm/cpuidle.rst

+2 −2
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ order to ask the hardware to enter that state. Also, for each 
statistics of the given idle state.  That information is exposed by the kernel

via ``sysfs``.



For each CPU in the system, there is a :file:`/sys/devices/system/cpu<N>/cpuidle/`

For each CPU in the system, there is a :file:`/sys/devices/system/cpu/cpu<N>/cpuidle/`

directory in ``sysfs``, where the number ``<N>`` is assigned to the given

CPU at the initialization time.  That directory contains a set of subdirectories

called :file:`state0`, :file:`state1` and so on, up to the number of idle state
@@ -494,7 +494,7 @@ object corresponding to it, as follows: 
	residency.



``below``

	Total number of times this idle state had been asked for, but cerainly

	Total number of times this idle state had been asked for, but certainly

	a deeper idle state would have been a better match for the observed idle

	duration.