JIRA: https://issues.redhat.com/browse/RHEL-2907



Conflicts:
    - drivers/net/wireless/purelifi/plfxlc/Kconfig
    - drivers/staging/wlan-ng/prism2usb.c
      Remove conflict hunks for unsupported purelifi and prism2 devices

commit 5d7cf67f72ae34d38e090bdfa673da4aefe4048e
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue Aug 8 20:44:48 2023 -0400

    Fix nomenclature for USB and PCI wireless devices
    
    A mouse that uses a USB connection is called a "USB mouse" device (or
    "USB mouse" for short), not a "mouse USB" device.  By analogy, a WiFi
    adapter that connects to the host computer via USB is a "USB wireless"
    device, not a "wireless USB" device.  (The latter term more properly
    refers to a defunct Wireless USB specification, which described a
    technology for sending USB protocol messages over an ultra wideband
    radio link.)
    
    Similarly for a WiFi adapter card that plugs into a PCIe slot: It is a
    "PCIe wireless" device, not a "wireless PCIe" device.
    
    Rephrase the text in the kernel source where the word ordering is
    wrong.
    
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
    Link: https://lore.kernel.org/r/57da7c80-0e48-41b5-8427-884a02648f55@rowland.harvard.edu



Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>