Merge remote-tracking branch 'net-next/master' into mac80211-next (b7b14ec1) · Commits · 戴 / test

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		cpld3_version

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show with which CPLD versions have been burned
		on LED board.
		@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		jtag_enable

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files enable and disable the access to the JTAG domain.
		By default access to the JTAG domain is disabled.
		@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		reset_voltmon_upgrade_fail

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show the system reset cause, as following: ComEx
		power fail, reset from ComEx, system platform reset, reset

+3 −4

Original line number	Diff line number	Diff line
		@@ -1701,12 +1701,11 @@
		By default, super page will be supported if Intel IOMMU
		has the capability. With this option, super page will
		not be supported.
		sm_off [Default Off]
		By default, scalable mode will be supported if the
		sm_on [Default Off]
		By default, scalable mode will be disabled even if the
		hardware advertises that it has support for the scalable
		mode translation. With this option set, scalable mode
		will not be used even on hardware which claims to support
		it.
		will be used on hardware which claims to support it.
		tboot_noforce [Default Off]
		Do not force the Intel IOMMU enabled under tboot.
		By default, tboot will force Intel IOMMU on, which

+5 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,11 @@ extra-y += $(DT_TMP_SCHEMA)
		quiet_cmd_mk_schema = SCHEMA $@
		cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)

		DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')
		DT_DOCS = $(shell \
		cd $(srctree)/$(src) && \
		find * $ -name '*.yaml' ! -name $(DT_TMP_SCHEMA) $ \
		)

		DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))

		extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@
		Required properties:
		- compatible: Should be "cdns,[<chip>-]{macb\|gem}"
		Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
		Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP
		available on sama5d3 SoCs.
		Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs.
		Use "cdns,sam9x60-macb" for Microchip sam9x60 SoC.
		Use "cdns,np4-macb" for NP4 SoC devices.
		Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
		Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ Optional properties:
		"marvell,armada-370-neta" and 9800B for others.
		- clock-names: List of names corresponding to clocks property; shall be
		"core" for core clock and "bus" for the optional bus clock.

		- phys: comphy for the ethernet port, see ../phy/phy-bindings.txt

		Optional properties (valid only for Armada XP/38x):