Commit 8e86652e authored Apr 10, 2023 by Greg Kroah-Hartman

Merge 6.3-rc6 into usb-next



We need the USB fixes in here for testing, and this resolves two merge
conflicts, one pointed out by linux-next:

	drivers/usb/dwc3/dwc3-pci.c
	drivers/usb/host/xhci-pci.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents 0246b15b 09a9639e

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -265,7 +265,9 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
		Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
		Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
		Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
		Leonard Göhrs <l.goehrs@pengutronix.de>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
		Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Documentation/admin-guide/index.rst

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ problems and bugs in particular.

		reporting-issues
		reporting-regressions
		security-bugs
		bug-hunting
		bug-bisect
		tainted-kernels

Documentation/admin-guide/reporting-issues.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the
		list of tracked regressions, to ensure it won't fall through the cracks.

		What qualifies as security issue is left to your judgment. Consider reading
		Documentation/admin-guide/security-bugs.rst before proceeding, as it
		Documentation/process/security-bugs.rst before proceeding, as it
		provides additional details how to best handle security issues.

		An issue is a 'really severe problem' when something totally unacceptably bad
		@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward
		the report's text to these addresses; but on top of it put a small note where
		you mention that you filed it with a link to the ticket.

		See Documentation/admin-guide/security-bugs.rst for more information.
		See Documentation/process/security-bugs.rst for more information.


		Duties after the report went out

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

+7 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,13 @@ properties:
		If "broken-flash-reset" is present then having this property does not
		make any difference.

		spi-cpol: true
		spi-cpha: true

		dependencies:
		spi-cpol: [ spi-cpha ]
		spi-cpha: [ spi-cpol ]

		unevaluatedProperties: false

		examples:

Documentation/devicetree/bindings/pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -96,9 +96,11 @@ $defs:
		2: Lower Slew rate (slower edges)
		3: Reserved (No adjustments)

		bias-bus-hold: true
		bias-pull-down: true
		bias-pull-up: true
		bias-disable: true
		input-enable: true
		output-high: true
		output-low: true