Unverified Commit 5fe7bd5a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'spi-5.15' into spi-5.16

parents 48a78c66 67a12ae5
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that
case the Linux IRQ numbers cannot be dynamically assigned and the legacy
mapping should be used.

As the name implies, the *_legacy() functions are deprecated and only
As the name implies, the \*_legacy() functions are deprecated and only
exist to ease the support of ancient platforms. No new users should be
added.
added. Same goes for the \*_simple() functions when their use results
in the legacy behaviour.

The legacy map assumes a contiguous range of IRQ numbers has already
been allocated for the controller and that the IRQ number can be
+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ examples:
      cs-gpios = <&gpio0 13 0>,
                 <&gpio0 14 0>;
      rx-sample-delay-ns = <3>;
      spi-flash@1 {
      flash@1 {
        compatible = "spi-nand";
        reg = <1>;
        rx-sample-delay-ns = <7>;
+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ NOTES:
- 0x88A8 traffic will not be received unless VLAN stripping is disabled with
  the following command::

    # ethool -K <ethX> rxvlan off
    # ethtool -K <ethX> rxvlan off

- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS
  configured on the same port. 0x88a8/0x8100 traffic will not be received if
+13 −22
Original line number Diff line number Diff line
@@ -977,12 +977,12 @@ L: platform-driver-x86@vger.kernel.org
S:	Maintained
F:	drivers/platform/x86/amd-pmc.*
AMD POWERPLAY
AMD POWERPLAY AND SWSMU
M:	Evan Quan <evan.quan@amd.com>
L:	amd-gfx@lists.freedesktop.org
S:	Supported
T:	git https://gitlab.freedesktop.org/agd5f/linux.git
F:	drivers/gpu/drm/amd/pm/powerplay/
F:	drivers/gpu/drm/amd/pm/
AMD PTDMA DRIVER
M:	Sanjay R Mehta <sanju.mehta@amd.com>
@@ -2804,9 +2804,8 @@ F: arch/arm/mach-pxa/include/mach/vpac270.h
F:	arch/arm/mach-pxa/vpac270.c
ARM/VT8500 ARM ARCHITECTURE
M:	Tony Prisk <linux@prisktech.co.nz>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
S:	Orphan
F:	Documentation/devicetree/bindings/i2c/i2c-wmt.txt
F:	arch/arm/mach-vt8500/
F:	drivers/clocksource/timer-vt8500.c
@@ -13255,9 +13254,9 @@ F: Documentation/scsi/NinjaSCSI.rst
F:	drivers/scsi/nsp32*
NIOS2 ARCHITECTURE
M:	Ley Foon Tan <ley.foon.tan@intel.com>
M:	Dinh Nguyen <dinguyen@kernel.org>
S:	Maintained
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
F:	arch/nios2/
NITRO ENCLAVES (NE)
@@ -16651,13 +16650,6 @@ M: Lubomir Rintel <lkundrak@v3.sk>
S:	Supported
F:	drivers/char/pcmcia/scr24x_cs.c
SCSI CDROM DRIVER
M:	Jens Axboe <axboe@kernel.dk>
L:	linux-scsi@vger.kernel.org
S:	Maintained
W:	http://www.kernel.dk
F:	drivers/scsi/sr*
SCSI RDMA PROTOCOL (SRP) INITIATOR
M:	Bart Van Assche <bvanassche@acm.org>
L:	linux-rdma@vger.kernel.org
@@ -16956,7 +16948,6 @@ F: drivers/misc/sgi-xp/
SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
M:	Karsten Graul <kgraul@linux.ibm.com>
M:	Guvenc Gulce <guvenc@linux.ibm.com>
L:	linux-s390@vger.kernel.org
S:	Supported
W:	http://www.ibm.com/developerworks/linux/linux390/
@@ -17969,10 +17960,11 @@ F: Documentation/admin-guide/svga.rst
F:	arch/x86/boot/video*
SWIOTLB SUBSYSTEM
M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
M:	Christoph Hellwig <hch@infradead.org>
L:	iommu@lists.linux-foundation.org
S:	Supported
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
W:	http://git.infradead.org/users/hch/dma-mapping.git
T:	git git://git.infradead.org/users/hch/dma-mapping.git
F:	arch/*/kernel/pci-swiotlb.c
F:	include/linux/swiotlb.h
F:	kernel/dma/swiotlb.c
@@ -19289,13 +19281,12 @@ S: Maintained
F:	drivers/usb/misc/chaoskey.c
USB CYPRESS C67X00 DRIVER
M:	Peter Korsgaard <jacmet@sunsite.dk>
L:	linux-usb@vger.kernel.org
S:	Maintained
S:	Orphan
F:	drivers/usb/c67x00/
USB DAVICOM DM9601 DRIVER
M:	Peter Korsgaard <jacmet@sunsite.dk>
M:	Peter Korsgaard <peter@korsgaard.com>
L:	netdev@vger.kernel.org
S:	Maintained
W:	http://www.linux-usb.org/usbnet
@@ -20475,7 +20466,6 @@ F: samples/bpf/xdpsock*
F:	tools/lib/bpf/xsk*
XEN BLOCK SUBSYSTEM
M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
M:	Roger Pau Monné <roger.pau@citrix.com>
L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)
S:	Supported
@@ -20523,7 +20513,7 @@ S: Supported
F:	drivers/net/xen-netback/*
XEN PCI SUBSYSTEM
M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
M:	Juergen Gross <jgross@suse.com>
L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)
S:	Supported
F:	arch/x86/pci/*xen*
@@ -20546,7 +20536,8 @@ S: Supported
F:	sound/xen/*
XEN SWIOTLB SUBSYSTEM
M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
M:	Juergen Gross <jgross@suse.com>
M:	Stefano Stabellini <sstabellini@kernel.org>
L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)
L:	iommu@lists.linux-foundation.org
S:	Supported
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 15
SUBLEVEL = 0
EXTRAVERSION = -rc2
EXTRAVERSION = -rc3
NAME = Opossums on Parade

# *DOCUMENTATION*
Loading