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

Merge commit b320441c ("Merge tag 'tty-6.5-rc7' of... 

Merge commit b320441c ("Merge tag 'tty-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty"

) into tty-next

We need the serial-core fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e67d7f60 b320441c

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -538,6 +538,8 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>

Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>

Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Horman <horms@kernel.org> <simon.horman@corigine.com>

Simon Horman <horms@kernel.org> <simon.horman@netronome.com>

Simon Kelley <simon@thekelleys.org.uk>

Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Documentation/ABI/testing/sysfs-bus-cxl

+13 −2
Original line number Diff line number Diff line
@@ -82,7 +82,12 @@ Description: 
		whether it resides in persistent capacity, volatile capacity,

		or the LSA, is made permanently unavailable by whatever means

		is appropriate for the media type. This functionality requires

		the device to be not be actively decoding any HPA ranges.

		the device to be disabled, that is, not actively decoding any

		HPA ranges. This permits avoiding explicit global CPU cache

		management, relying instead for it to be done when a region

		transitions between software programmed and hardware committed

		states. If this file is not present, then there is no hardware

		support for the operation.





What            /sys/bus/cxl/devices/memX/security/erase
@@ -92,7 +97,13 @@ Contact: linux-cxl@vger.kernel.org 
Description:

		(WO) Write a boolean 'true' string value to this attribute to

		secure erase user data by changing the media encryption keys for

		all user data areas of the device.

		all user data areas of the device. This functionality requires

		the device to be disabled, that is, not actively decoding any

		HPA ranges. This permits avoiding explicit global CPU cache

		management, relying instead for it to be done when a region

		transitions between software programmed and hardware committed

		states. If this file is not present, then there is no hardware

		support for the operation.





What:		/sys/bus/cxl/devices/memX/firmware/

Documentation/ABI/testing/sysfs-devices-system-cpu

+7 −6
Original line number Diff line number Diff line
@@ -513,17 +513,18 @@ Description: information about CPUs heterogeneity. 
		cpu_capacity: capacity of cpuX.



What:		/sys/devices/system/cpu/vulnerabilities

		/sys/devices/system/cpu/vulnerabilities/gather_data_sampling

		/sys/devices/system/cpu/vulnerabilities/itlb_multihit

		/sys/devices/system/cpu/vulnerabilities/l1tf

		/sys/devices/system/cpu/vulnerabilities/mds

		/sys/devices/system/cpu/vulnerabilities/meltdown

		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data

		/sys/devices/system/cpu/vulnerabilities/retbleed

		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass

		/sys/devices/system/cpu/vulnerabilities/spectre_v1

		/sys/devices/system/cpu/vulnerabilities/spectre_v2

		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass

		/sys/devices/system/cpu/vulnerabilities/l1tf

		/sys/devices/system/cpu/vulnerabilities/mds

		/sys/devices/system/cpu/vulnerabilities/srbds

		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort

		/sys/devices/system/cpu/vulnerabilities/itlb_multihit

		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data

		/sys/devices/system/cpu/vulnerabilities/retbleed

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities

Documentation/ABI/testing/sysfs-platform-hidma

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ What: /sys/devices/platform/hidma-*/chid 
		/sys/devices/platform/QCOM8061:*/chid

Date:		Dec 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Contains the ID of the channel within the HIDMA instance.

		It is used to associate a given HIDMA channel with the

Documentation/ABI/testing/sysfs-platform-hidma-mgmt

+10 −10
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ What: /sys/devices/platform/hidma-mgmt*/chanops/chan*/priority 
		/sys/devices/platform/QCOM8060:*/chanops/chan*/priority

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Contains either 0 or 1 and indicates if the DMA channel is a

		low priority (0) or high priority (1) channel.
@@ -11,7 +11,7 @@ What: /sys/devices/platform/hidma-mgmt*/chanops/chan*/weight 
		/sys/devices/platform/QCOM8060:*/chanops/chan*/weight

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Contains 0..15 and indicates the weight of the channel among

		equal priority channels during round robin scheduling.
@@ -20,7 +20,7 @@ What: /sys/devices/platform/hidma-mgmt*/chreset_timeout_cycles 
		/sys/devices/platform/QCOM8060:*/chreset_timeout_cycles

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Contains the platform specific cycle value to wait after a

		reset command is issued. If the value is chosen too short,
@@ -32,7 +32,7 @@ What: /sys/devices/platform/hidma-mgmt*/dma_channels 
		/sys/devices/platform/QCOM8060:*/dma_channels

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Contains the number of dma channels supported by one instance

		of HIDMA hardware. The value may change from chip to chip.
@@ -41,7 +41,7 @@ What: /sys/devices/platform/hidma-mgmt*/hw_version_major 
		/sys/devices/platform/QCOM8060:*/hw_version_major

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Version number major for the hardware.
@@ -49,7 +49,7 @@ What: /sys/devices/platform/hidma-mgmt*/hw_version_minor 
		/sys/devices/platform/QCOM8060:*/hw_version_minor

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Version number minor for the hardware.
@@ -57,7 +57,7 @@ What: /sys/devices/platform/hidma-mgmt*/max_rd_xactions 
		/sys/devices/platform/QCOM8060:*/max_rd_xactions

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Contains a value between 0 and 31. Maximum number of

		read transactions that can be issued back to back.
@@ -69,7 +69,7 @@ What: /sys/devices/platform/hidma-mgmt*/max_read_request 
		/sys/devices/platform/QCOM8060:*/max_read_request

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Size of each read request. The value needs to be a power

		of two and can be between 128 and 1024.
@@ -78,7 +78,7 @@ What: /sys/devices/platform/hidma-mgmt*/max_wr_xactions 
		/sys/devices/platform/QCOM8060:*/max_wr_xactions

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Contains a value between 0 and 31. Maximum number of

		write transactions that can be issued back to back.
@@ -91,7 +91,7 @@ What: /sys/devices/platform/hidma-mgmt*/max_write_request 
		/sys/devices/platform/QCOM8060:*/max_write_request

Date:		Nov 2015

KernelVersion:	4.4

Contact:	"Sinan Kaya <okaya@codeaurora.org>"

Contact:	"Sinan Kaya <okaya@kernel.org>"

Description:

		Size of each write request. The value needs to be a power

		of two and can be between 128 and 1024.