Commit ca9400ef authored Feb 28, 2022 by Greg Kroah-Hartman

Merge 5.17-rc6 into usb-next



We need the USB fixes in here, and it resolves a merge conflict in:
	drivers/usb/dwc3/dwc3-pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents f6a9a2d6 7e57714c

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
		Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
		Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
		Rudolf Marek <R.Marek@sh.cvut.cz>
		Rui Saraiva <rmps@joel.ist.utl.pt>

Documentation/ABI/testing/sysfs-class-power

+1 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,7 @@ Description:
		auto: Charge normally, respect thresholds
		inhibit-charge: Do not charge while AC is attached
		force-discharge: Force discharge while AC is attached
		================ ====================================

		What: /sys/class/power_supply/<supply_name>/technology
		Date: May 2007

Documentation/core-api/dma-attributes.rst

+8 −0

Original line number	Diff line number	Diff line
		@@ -130,3 +130,11 @@ accesses to DMA buffers in both privileged "supervisor" and unprivileged
		subsystem that the buffer is fully accessible at the elevated privilege
		level (and ideally inaccessible or at least read-only at the
		lesser-privileged levels).

		DMA_ATTR_OVERWRITE
		------------------

		This is a hint to the DMA-mapping subsystem that the device is expected to
		overwrite the entire mapped size, thus the caller does not require any of the
		previous buffer contents to be preserved. This allows bounce-buffering
		implementations to optimise DMA_FROM_DEVICE transfers.

Documentation/cpu-freq/cpu-drivers.rst

+3 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,9 @@ And optionally
		.resume - A pointer to a per-policy resume function which is called
		with interrupts disabled and _before_ the governor is started again.

		.ready - A pointer to a per-policy ready function which is called after
		the policy is fully initialized.

		.attr - A pointer to a NULL-terminated list of "struct freq_attr" which
		allow to export values to sysfs.

Documentation/devicetree/bindings/gpio/sifive,gpio.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: SiFive GPIO controller

		maintainers:
		- Yash Shah <yash.shah@sifive.com>
		- Paul Walmsley <paul.walmsley@sifive.com>

		properties: