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

Merge 6.2-rc8 into usb-next 



We need the USB fixes in here for testing.

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

Documentation/devicetree/bindings/.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -2,3 +2,8 @@ 
*.example.dts

/processed-schema*.yaml

/processed-schema*.json



#

# We don't want to ignore the following even if they are dot-files

#

!.yamllint

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ properties: 


  msi-controller:

    description:

      Only present if the Message Based Interrupt functionnality is

      Only present if the Message Based Interrupt functionality is

      being exposed by the HW, and the mbi-ranges property present.



  mbi-ranges:

Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ Contents 


Support

=======

If you got any problem, contact Wangxun support team via support@trustnetic.com

If you got any problem, contact Wangxun support team via nic-support@net-swift.com

and Cc: netdev.

MAINTAINERS

+7 −6
Original line number Diff line number Diff line
@@ -16120,7 +16120,7 @@ F: drivers/pci/controller/pci-v3-semi.c 








PCI ENDPOINT SUBSYSTEM









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>









R:	Krzysztof Wilczyński <kw@linux.com>









M:	Krzysztof Wilczyński <kw@linux.com>









R:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









R:	Kishon Vijay Abraham I <kishon@kernel.org>









L:	linux-pci@vger.kernel.org








@@ -16128,7 +16128,7 @@ S:	Supported







Q:	https://patchwork.kernel.org/project/linux-pci/list/









B:	https://bugzilla.kernel.org









C:	irc://irc.oftc.net/linux-pci









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git









F:	Documentation/PCI/endpoint/*









F:	Documentation/misc-devices/pci-endpoint-test.rst









F:	drivers/misc/pci_endpoint_test.c








@@ -16163,7 +16163,7 @@ S:	Supported







Q:	https://patchwork.kernel.org/project/linux-pci/list/









B:	https://bugzilla.kernel.org









C:	irc://irc.oftc.net/linux-pci









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git









F:	Documentation/driver-api/pci/p2pdma.rst









F:	drivers/pci/p2pdma.c









F:	include/linux/pci-p2pdma.h








@@ -16185,14 +16185,14 @@ F:	drivers/pci/controller/pci-xgene-msi.c















PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>









M:	Krzysztof Wilczyński <kw@linux.com>









R:	Rob Herring <robh@kernel.org>









R:	Krzysztof Wilczyński <kw@linux.com>









L:	linux-pci@vger.kernel.org









S:	Supported









Q:	https://patchwork.kernel.org/project/linux-pci/list/









B:	https://bugzilla.kernel.org









C:	irc://irc.oftc.net/linux-pci









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git









F:	Documentation/devicetree/bindings/pci/









F:	drivers/pci/controller/









F:	drivers/pci/pci-bridge-emul.c








@@ -16205,7 +16205,7 @@ S:	Supported







Q:	https://patchwork.kernel.org/project/linux-pci/list/









B:	https://bugzilla.kernel.org









C:	irc://irc.oftc.net/linux-pci









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git









F:	Documentation/PCI/









F:	Documentation/devicetree/bindings/pci/









F:	arch/x86/kernel/early-quirks.c








@@ -20098,6 +20098,7 @@ F:	drivers/watchdog/sunplus_wdt.c







SUPERH









M:	Yoshinori Sato <ysato@users.sourceforge.jp>









M:	Rich Felker <dalias@libc.org>









M:	John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>









L:	linux-sh@vger.kernel.org









S:	Maintained









Q:	http://patchwork.kernel.org/project/linux-sh/list/

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 2









SUBLEVEL = 0









EXTRAVERSION = -rc7









EXTRAVERSION = -rc8









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*