]> Git Repo - linux.git/commitdiff
Merge tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <[email protected]>
Fri, 16 Oct 2020 22:02:21 +0000 (15:02 -0700)
committerLinus Torvalds <[email protected]>
Fri, 16 Oct 2020 22:02:21 +0000 (15:02 -0700)
Pull documentation updates from Mauro Carvalho Chehab:
 "A series of patches addressing warnings produced by make htmldocs.
  This includes:

   - kernel-doc markup fixes

   - ReST fixes

   - Updates at the build system in order to support newer versions of
     the docs build toolchain (Sphinx)

  After this series, the number of html build warnings should reduce
  significantly, and building with Sphinx 3.1 or later should now be
  supported (although it is still recommended to use Sphinx 2.4.4).

  As agreed with Jon, I should be sending you a late pull request by the
  end of the merge window addressing remaining issues with docs build,
  as there are a number of warning fixes that depends on pull requests
  that should be happening along the merge window.

  The end goal is to have a clean htmldocs build on Kernel 5.10.

  PS. It should be noticed that Sphinx 3.0 is not currently supported,
  as it lacks support for C domain namespaces. Such feature, needed in
  order to document uAPI system calls with Sphinx 3.x, was added only on
  Sphinx 3.1"

* tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (75 commits)
  PM / devfreq: remove a duplicated kernel-doc markup
  mm/doc: fix a literal block markup
  workqueue: fix a kernel-doc warning
  docs: virt: user_mode_linux_howto_v2.rst: fix a literal block markup
  Input: sparse-keymap: add a description for @sw
  rcu/tree: docs: document bkvcache new members at struct kfree_rcu_cpu
  nl80211: docs: add a description for s1g_cap parameter
  usb: docs: document altmode register/unregister functions
  kunit: test.h: fix a bad kernel-doc markup
  drivers: core: fix kernel-doc markup for dev_err_probe()
  docs: bio: fix a kerneldoc markup
  kunit: test.h: solve kernel-doc warnings
  block: bio: fix a warning at the kernel-doc markups
  docs: powerpc: syscall64-abi.rst: fix a malformed table
  drivers: net: hamradio: fix document location
  net: appletalk: Kconfig: Fix docs location
  dt-bindings: fix references to files converted to yaml
  memblock: get rid of a :c:type leftover
  math64.h: kernel-docs: Convert some markups into normal comments
  media: uAPI: buffer.rst: remove a left-over documentation
  ...

1  2 
Documentation/driver-api/mei/mei.rst
MAINTAINERS
drivers/base/core.c
include/net/cfg80211.h

index cea0b69ec216b855ea8894274f4baeb19d483a89,71edf022a7fec80e06c5ea653b481bbe7bcfb305..4f2ced4ccdc66ebbacdf9352b37dd1dcec1b013d
@@@ -38,15 -38,10 +38,15 @@@ Because some of the Intel ME features c
  configuration, the driver by default allows only a privileged
  user to access it.
  
- The session is terminated calling :c:func:`close(int fd)`.
+ The session is terminated calling :c:expr:`close(fd)`.
  
  A code snippet for an application communicating with Intel AMTHI client:
  
 +In order to support virtualization or sandboxing a trusted supervisor
 +can use :c:macro:`MEI_CONNECT_CLIENT_IOCTL_VTAG` to create
 +virtual channels with an Intel ME feature. Not all features support
 +virtual channels such client with answer EOPNOTSUPP.
 +
  .. code-block:: C
  
        struct mei_connect_client_data data;
@@@ -115,38 -110,6 +115,38 @@@ Connect to firmware Feature/Client
          data that can be sent or received. (e.g. if MTU=2K, can send
          requests up to bytes 2k and received responses up to 2k bytes).
  
 +IOCTL_MEI_CONNECT_CLIENT_VTAG:
 +------------------------------
 +
 +.. code-block:: none
 +
 +        Usage:
 +
 +        struct mei_connect_client_data_vtag client_data_vtag;
 +
 +        ioctl(fd, IOCTL_MEI_CONNECT_CLIENT_VTAG, &client_data_vtag);
 +
 +        Inputs:
 +
 +        struct mei_connect_client_data_vtag - contain the following
 +        Input field:
 +
 +                in_client_uuid -  GUID of the FW Feature that needs
 +                                  to connect to.
 +                vtag - virtual tag [1, 255]
 +
 +         Outputs:
 +                out_client_properties - Client Properties: MTU and Protocol Version.
 +
 +         Error returns:
 +
 +                ENOTTY No such client (i.e. wrong GUID) or connection is not allowed.
 +                EINVAL Wrong IOCTL Number or tag == 0
 +                ENODEV Device or Connection is not initialized or ready.
 +                ENOMEM Unable to allocate memory to client internal data.
 +                EFAULT Fatal Error (e.g. Unable to access user input data)
 +                EBUSY  Connection Already Open
 +                EOPNOTSUPP Vtag is not supported
  
  IOCTL_MEI_NOTIFY_SET
  ---------------------
diff --combined MAINTAINERS
index ada7ea989ae64111b1af98e6177a834e5b4aea82,ab0361f4bd9f31ccf8e76fbf3a6769626ef3a051..b158ec4a5e42d8855739d34ee67b7f5cfb375be3
@@@ -950,12 -950,37 +950,12 @@@ S:      Supporte
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  F:    drivers/net/ethernet/amd/xgbe/
  
 -ANALOG DEVICES INC AD5686 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    drivers/iio/dac/ad5686*
 -F:    drivers/iio/dac/ad5696*
 -
 -ANALOG DEVICES INC AD5758 DRIVER
 -M:    Michael Hennerich <[email protected]>
 +AMS AS73211 DRIVER
 +M:    Christian Eggers <[email protected]>
  L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
 -F:    drivers/iio/dac/ad5758.c
 -
 -ANALOG DEVICES INC AD7091R5 DRIVER
 -M:    Beniamin Bia <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
 -F:    drivers/iio/adc/ad7091r5.c
 -
 -ANALOG DEVICES INC AD7124 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 -F:    drivers/iio/adc/ad7124.c
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
 +F:    drivers/iio/light/as73211.c
  
  ANALOG DEVICES INC AD7192 DRIVER
  M:    Alexandru Tachici <[email protected]>
@@@ -973,6 -998,15 +973,6 @@@ W:        http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 -ANALOG DEVICES INC AD7606 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
 -F:    drivers/iio/adc/ad7606.c
 -
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
@@@ -1034,6 -1068,7 +1034,6 @@@ F:      drivers/iio/imu/adis16475.
  F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
  
  ANALOG DEVICES INC ADM1177 DRIVER
 -M:    Beniamin Bia <[email protected]>
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
  S:    Maintained
  F:    drivers/media/i2c/adv7842*
  
 +ANALOG DEVICES INC ADXRS290 DRIVER
 +M:    Nishant Malpani <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/gyro/adxrs290.c
 +F:    Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Nuno Sá <[email protected]>
@@@ -1107,6 -1135,15 +1107,6 @@@ S:     Supporte
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    drivers/dma/dma-axi-dmac.c
  
 -ANALOG DEVICES INC HMC425A DRIVER
 -M:    Beniamin Bia <[email protected]>
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
 -F:    drivers/iio/amplifiers/hmc425a.c
 -
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -1115,11 -1152,8 +1115,11 @@@ W:    http://wiki.analog.com
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
 +F:    Documentation/devicetree/bindings/iio/*/adi,*
 +F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
  F:    drivers/iio/*/ad*
  F:    drivers/iio/adc/ltc249*
 +F:    drivers/iio/amplifiers/hmc425a.c
  F:    drivers/staging/iio/*/ad*
  X:    drivers/iio/*/adjd*
  
@@@ -1259,7 -1293,7 +1259,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  F:    drivers/net/ethernet/apm/xgene/
 -F:    drivers/net/phy/mdio-xgene.c
 +F:    drivers/net/mdio/mdio-xgene.c
  
  APPLIED MICRO (APM) X-GENE SOC PMU
  M:    Khuong Dinh <[email protected]>
@@@ -1500,7 -1534,7 +1500,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
- F:    Documentation/devicetree/bindings/dma/owl-dma.txt
+ F:    Documentation/devicetree/bindings/dma/owl-dma.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
  F:    Documentation/devicetree/bindings/mmc/owl-mmc.yaml
@@@ -1725,7 -1759,6 +1725,7 @@@ ARM/CORESIGHT FRAMEWORK AND DRIVER
  M:    Mathieu Poirier <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
  R:    Mike Leach <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -3238,7 -3271,7 +3238,7 @@@ M:      Daniel Borkmann <[email protected]
  R:    Martin KaFai Lau <[email protected]>
  R:    Song Liu <[email protected]>
  R:    Yonghong Song <[email protected]>
 -R:    Andrii Nakryiko <andrii[email protected]>
 +R:    Andrii Nakryiko <andrii@kernel.org>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
  L:    [email protected]
@@@ -3455,14 -3488,6 +3455,14 @@@ F:    drivers/bus/brcmstb_gisb.
  F:    drivers/pci/controller/pcie-brcmstb.c
  N:    brcmstb
  
 +BROADCOM BDC DRIVER
 +M:    Al Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/brcm,bdc.txt
 +F:    drivers/usb/gadget/udc/bdc/
 +
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
  M:    [email protected]
@@@ -3840,16 -3865,6 +3840,16 @@@ S:    Orpha
  F:    Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
  F:    drivers/mtd/nand/raw/cadence-nand-controller.c
  
 +CADENCE USB3 DRD IP DRIVER
 +M:    Peter Chen <[email protected]>
 +M:    Pawel Laszczak <[email protected]>
 +M:    Roger Quadros <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 +F:    Documentation/devicetree/bindings/usb/cdns-usb3.txt
 +F:    drivers/usb/cdns3/
 +
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -3914,7 -3929,6 +3914,7 @@@ F:      include/net/netns/can.
  F:    include/uapi/linux/can.h
  F:    include/uapi/linux/can/bcm.h
  F:    include/uapi/linux/can/gw.h
 +F:    include/uapi/linux/can/isotp.h
  F:    include/uapi/linux/can/raw.h
  F:    net/can/
  
@@@ -4103,11 -4117,6 +4103,11 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    drivers/char/
  F:    drivers/misc/
  F:    include/linux/miscdevice.h
 +X:    drivers/char/agp/
 +X:    drivers/char/hw_random/
 +X:    drivers/char/ipmi/
 +X:    drivers/char/random.c
 +X:    drivers/char/tpm/
  
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
@@@ -4178,7 -4187,6 +4178,7 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
  M:    James Schulman <[email protected]>
  M:    David Rhodes <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    sound/soc/codecs/cs*
  
@@@ -4416,7 -4424,6 +4416,7 @@@ S:      Supporte
  T:    git git://git.infradead.org/users/hch/configfs.git
  F:    fs/configfs/
  F:    include/linux/configfs.h
 +F:    samples/configfs/
  
  CONSOLE SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -4714,15 -4721,6 +4714,15 @@@ S:    Supporte
  W:    http://www.chelsio.com
  F:    drivers/crypto/chelsio
  
 +CXGB4 INLINE CRYPTO DRIVER
 +M:    Ayush Sawal <[email protected]>
 +M:    Vinay Kumar Yadav <[email protected]>
 +M:    Rohit Maheshwari <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.chelsio.com
 +F:    drivers/net/ethernet/chelsio/inline_crypto/
 +
  CXGB4 ETHERNET DRIVER (CXGB4)
  M:    Vishal Kulkarni <[email protected]>
  L:    [email protected]
@@@ -5227,7 -5225,7 +5227,7 @@@ T:      git git://git.infradead.org/users/hc
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
 -F:    include/linux/dma-noncoherent.h
 +F:    include/linux/dma-map-ops.h
  F:    kernel/dma/
  
  DMA-BUF HEAPS FRAMEWORK
@@@ -5429,7 -5427,7 +5429,7 @@@ F:      drivers/gpu/drm/panel/panel-arm-vers
  
  DRM DRIVER FOR ASPEED BMC GFX
  M:    Joel Stanley <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
@@@ -5437,10 -5435,7 +5437,10 @@@ F:    drivers/gpu/drm/aspeed
  
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/ast/
  
  DRM DRIVER FOR BOCHS VIRTUAL GPU
@@@ -5514,24 -5509,14 +5514,24 @@@ S:   Maintaine
  F:    drivers/gpu/drm/panel/panel-lvds.c
  F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
  
 +DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 +M:    Guido Günther <[email protected]>
 +R:    Purism Kernel Team <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
 +F:    drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
 +
  DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/mga/
  F:    include/uapi/drm/mga_drm.h
  
 -DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/mgag200/
  
  DRM DRIVER FOR MI0283QT
@@@ -5612,13 -5597,12 +5612,13 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
  F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
  
 -DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
 +DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 +R:    Ondrej Jirman <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
 -F:    drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
 +F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
 +F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
  
  DRM DRIVER FOR SAVAGE VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -5677,15 -5661,13 +5677,15 @@@ F:   drivers/gpu/drm/panel/panel-tpo-tpg1
  DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
  M:    Dave Airlie <[email protected]>
  R:    Sean Paul <[email protected]>
 +R:    Thomas Zimmermann <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/udl/
  
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <[email protected]>
 +M:    Melissa Wen <[email protected]>
  R:    Haneen Mohammed <[email protected]>
  R:    Daniel Vetter <[email protected]>
  L:    [email protected]
@@@ -5820,7 -5802,7 +5820,7 @@@ F:      drivers/gpu/drm/gma500
  
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
 -M:    Rongrong Zou <zourongrong@gmail.com>
 +M:    Tian Tao  <tiantao6@hisilicon.com>
  R:    John Stultz <[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
@@@ -5846,7 -5828,6 +5846,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
 +F:    drivers/phy/mediatek/phy-mtk-hdmi*
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
@@@ -5868,7 -5849,7 +5868,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://linuxtv.org/pinchartl/media drm/du/next
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
- F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
+ F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
@@@ -6556,14 -6537,11 +6556,14 @@@ F:   Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/devicetree/bindings/net/qca,ar803x.yaml
  F:    Documentation/networking/phy.rst
 +F:    drivers/net/mdio/
 +F:    drivers/net/mdio/of_mdio.c
 +F:    drivers/net/pcs/
  F:    drivers/net/phy/
 -F:    drivers/of/of_mdio.c
  F:    drivers/of/of_net.c
  F:    include/dt-bindings/net/qca-ar803x.h
  F:    include/linux/*mdio*.h
 +F:    include/linux/mdio/*.h
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
@@@ -6639,7 -6617,6 +6639,7 @@@ F:      fs/proc/bootconfig.
  F:    include/linux/bootconfig.h
  F:    lib/bootconfig.c
  F:    tools/bootconfig/*
 +F:    tools/bootconfig/scripts/*
  
  EXYNOS DP DRIVER
  M:    Jingoo Han <[email protected]>
@@@ -6867,17 -6844,14 +6867,17 @@@ F:   drivers/net/ethernet/nvidia/
  
  FPGA DFL DRIVERS
  M:    Wu Hao <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-dfl
  F:    Documentation/fpga/dfl.rst
  F:    drivers/fpga/dfl*
  F:    include/uapi/linux/fpga-dfl.h
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.rocketboards.org
@@@ -7000,7 -6974,7 +7000,7 @@@ M:      Frank Li <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/perf/imx-ddr.rst
- F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
+ F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
  F:    drivers/perf/fsl_imx8_ddr_perf.c
  
  FREESCALE IMX I2C DRIVER
@@@ -7008,7 -6982,7 +7008,7 @@@ M:      Oleksij Rempel <o.rempel@pengutronix
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/devicetree/bindings/i2c/i2c-imx.txt
+ F:    Documentation/devicetree/bindings/i2c/i2c-imx.yaml
  F:    drivers/i2c/busses/i2c-imx.c
  
  FREESCALE IMX LPI2C DRIVER
@@@ -7016,7 -6990,7 +7016,7 @@@ M:      Dong Aisheng <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
- F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
+ F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
  
  FREESCALE QORIQ DPAA ETHERNET DRIVER
@@@ -7927,13 -7901,6 +7927,13 @@@ W:    http://www.hisilicon.co
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  F:    drivers/net/ethernet/hisilicon/
  
 +HIKEY960 ONBOARD USB GPIO HUB DRIVER
 +M:    John Stultz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/hisi_hikey_usb.c
 +F:    Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
 +
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <[email protected]>
  S:    Supported
@@@ -7977,12 -7944,6 +7977,12 @@@ F:    drivers/crypto/hisilicon/sec2/sec_cr
  F:    drivers/crypto/hisilicon/sec2/sec_crypto.h
  F:    drivers/crypto/hisilicon/sec2/sec_main.c
  
 +HISILICON STAGING DRIVERS FOR HIKEY 960/970
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/hikey9xx/
 +
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
  M:    Zaibo Xu <[email protected]>
  S:    Maintained
@@@ -8560,6 -8521,7 +8560,6 @@@ F:      drivers/iio/multiplexer/iio-mux.
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
 -R:    Hartmut Knaack <[email protected]>
  R:    Lars-Peter Clausen <[email protected]>
  R:    Peter Meerwald-Stadler <[email protected]>
  L:    [email protected]
@@@ -8675,9 -8637,8 +8675,9 @@@ INGENIC JZ47xx SoC
  M:    Paul Cercueil <[email protected]>
  S:    Maintained
  F:    arch/mips/boot/dts/ingenic/
 -F:    arch/mips/include/asm/mach-jz4740/
 -F:    arch/mips/jz4740/
 +F:    arch/mips/generic/board-ingenic.c
 +F:    arch/mips/include/asm/mach-ingenic/
 +F:    arch/mips/ingenic/Kconfig
  F:    drivers/clk/ingenic/
  F:    drivers/dma/dma-jz4780.c
  F:    drivers/gpu/drm/ingenic/
@@@ -9716,7 -9677,7 +9716,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9728,7 -9689,7 +9728,7 @@@ F:      security/keys/trusted-keys
  
  KEYS/KEYRINGS
  M:    David Howells <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/security/keys/core.rst
@@@ -10361,13 -10322,6 +10361,13 @@@ S: Maintaine
  W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
  
 +LYNX PCS MODULE
 +M:    Ioana Ciornei <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/pcs/pcs-lynx.c
 +F:    include/linux/pcs-lynx.h
 +
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
@@@ -10575,7 -10529,7 +10575,7 @@@ M:   Tobias Waldekranz <tobias@waldekranz
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/marvell,mvusb.yaml
 -F:    drivers/net/phy/mdio-mvusb.c
 +F:    drivers/net/mdio/mdio-mvusb.c
  
  MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
  M:    Hu Ziji <[email protected]>
  S:    Maintained
  F:    drivers/hid/hid-mcp2221.c
  
 +MCP251XFD SPI-CAN NETWORK DRIVER
 +M:    Marc Kleine-Budde <[email protected]>
 +M:    Manivannan Sadhasivam <[email protected]>
 +R:    Thomas Kopp <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
 +F:    drivers/net/can/spi/mcp251xfd/
 +
  MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -11121,7 -11066,7 +11121,7 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK USB3 DRD IP DRIVER
  M:    Chunfeng Yun <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -11419,7 -11364,6 +11419,7 @@@ M:   Hemant Kumar <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
 +F:    Documentation/ABI/stable/sysfs-bus-mhi
  F:    Documentation/mhi/
  F:    drivers/bus/mhi/
  F:    include/linux/mhi.h
@@@ -11677,7 -11621,7 +11677,7 @@@ MIPS GENERIC PLATFOR
  M:    Paul Burton <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/devicetree/bindings/power/mti,mips-cpc.txt
+ F:    Documentation/devicetree/bindings/power/mti,mips-cpc.yaml
  F:    arch/mips/generic/
  F:    arch/mips/tools/generic-board-config.sh
  
@@@ -11733,7 -11677,7 +11733,7 @@@ S:   Odd Fixe
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
  F:    arch/arm/boot/dts/mmp*
  F:    arch/arm/mach-mmp/
 -F:    linux/soc/mmp/
 +F:    include/linux/soc/mmp/
  
  MMP USB PHY DRIVERS
  R:    Lubomir Rintel <[email protected]>
@@@ -12120,6 -12064,7 +12120,6 @@@ M:   Neil Horman <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://fedorahosted.org/dropwatch/
 -F:    include/net/drop_monitor.h
  F:    include/uapi/linux/net_dropmon.h
  F:    net/core/drop_monitor.c
  
@@@ -12214,7 -12159,6 +12214,7 @@@ F:   net/ipv6/ipcomp6.
  F:    net/ipv6/xfrm*
  F:    net/key/
  F:    net/xfrm/
 +F:    tools/testing/selftests/net/ipsec.c
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
@@@ -12374,19 -12318,6 +12374,19 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
  F:    arch/nios2/
  
 +NITRO ENCLAVES (NE)
 +M:    Andra Paraschiv <[email protected]>
 +M:    Alexandru Vasile <[email protected]>
 +M:    Alexandru Ciobotaru <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://aws.amazon.com/ec2/nitro/nitro-enclaves/
 +F:    Documentation/virt/ne_overview.rst
 +F:    drivers/virt/nitro_enclaves/
 +F:    include/linux/nitro_enclaves.h
 +F:    include/uapi/linux/nitro_enclaves.h
 +F:    samples/nitro_enclaves/
 +
  NOHZ, DYNTICKS SUPPORT
  M:    Frederic Weisbecker <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -12549,26 -12480,11 +12549,26 @@@ F:        drivers/iio/gyro/fxas21002c_core.
  F:    drivers/iio/gyro/fxas21002c_i2c.c
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
 +NXP i.MX 8MQ DCSS DRIVER
 +M:    Laurentiu Palcu <[email protected]>
 +R:    Lucas Stach <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
 +F:    drivers/gpu/drm/imx/dcss/
 +
 +NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 +M:    Krzysztof Kozlowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
 +F:    drivers/extcon/extcon-ptn5150.c
 +
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
- F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
+ F:    Documentation/devicetree/bindings/sound/sgtl5000.yaml
  F:    sound/soc/codecs/sgtl5000*
  
  NXP SJA1105 ETHERNET SWITCH DRIVER
@@@ -12627,7 -12543,6 +12627,7 @@@ F:   drivers/net/dsa/ocelot/
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
  M:    Frederic Barrat <[email protected]>
@@@ -15403,11 -15318,10 +15403,11 @@@ F:        drivers/media/platform/s3c-camif
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Robert Baldyga <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
  F:    drivers/nfc/s3fwrn5
  
  SAMSUNG S5C73M3 CAMERA DRIVER
  S:    Maintained
  F:    drivers/net/phy/phylink.c
  F:    drivers/net/phy/sfp*
 +F:    include/linux/mdio/mdio-i2c.h
  F:    include/linux/phylink.h
  F:    include/linux/sfp.h
  K:    phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
@@@ -16620,6 -16533,7 +16620,6 @@@ F:   drivers/staging/rtl8712
  
  STAGING - SEPS525 LCD CONTROLLER DRIVERS
  M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
@@@ -16868,7 -16782,7 +16868,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  S:    Maintained
- F:    Documentation/devicetree/bindings/dma/snps-dma.txt
+ F:    Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml
  F:    drivers/dma/dw/
  F:    include/dt-bindings/dma/dw-dmac.h
  F:    include/linux/dma/dw.h
@@@ -16884,8 -16798,8 +16884,8 @@@ SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVE
  M:    Jose Abreu <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/phy/mdio-xpcs.c
 -F:    include/linux/mdio-xpcs.h
 +F:    drivers/net/pcs/pcs-xpcs.c
 +F:    include/linux/pcs/pcs-xpcs.h
  
  SYNOPSYS DESIGNWARE I2C DRIVER
  M:    Jarkko Nikula <[email protected]>
@@@ -17718,7 -17632,7 +17718,7 @@@ F:   drivers/platform/x86/toshiba-wmi.
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  R:    Jason Gunthorpe <[email protected]>
  L:    [email protected]
  S:    Maintained
diff --combined drivers/base/core.c
index b919e6d01d9a01198ebc0ea8c9d5ae7545859200,b7687808e778d99e5b81a58cc5a6a492003c500f..c852f16c111b248046bc1e73e0246eb49e1ae332
@@@ -1798,8 -1798,6 +1798,8 @@@ static void device_release(struct kobje
         */
        devres_release_all(dev);
  
 +      kfree(dev->dma_range_map);
 +
        if (dev->release)
                dev->release(dev);
        else if (dev->type && dev->type->release)
@@@ -4212,13 -4210,16 +4212,16 @@@ define_dev_printk_level(_dev_info, KERN
   * -EPROBE_DEFER and propagate error upwards.
   * In case of -EPROBE_DEFER it sets also defer probe reason, which can be
   * checked later by reading devices_deferred debugfs attribute.
-  * It replaces code sequence:
+  * It replaces code sequence::
+  *
   *    if (err != -EPROBE_DEFER)
   *            dev_err(dev, ...);
   *    else
   *            dev_dbg(dev, ...);
   *    return err;
-  * with
+  *
+  * with::
+  *
   *    return dev_err_probe(dev, err, ...);
   *
   * Returns @err.
diff --combined include/net/cfg80211.h
index aee47f2b5709e2589a4910a16bf6f548a448dd01,fb6aece005495851ba2c475d0afde4d765629dfd..661edfc8722e1cf205cceb836a851de40210e1a8
@@@ -96,16 -96,6 +96,16 @@@ struct wiphy
   * @IEEE80211_CHAN_NO_10MHZ: 10 MHz bandwidth is not permitted
   *    on this channel.
   * @IEEE80211_CHAN_NO_HE: HE operation is not permitted on this channel.
 + * @IEEE80211_CHAN_1MHZ: 1 MHz bandwidth is permitted
 + *    on this channel.
 + * @IEEE80211_CHAN_2MHZ: 2 MHz bandwidth is permitted
 + *    on this channel.
 + * @IEEE80211_CHAN_4MHZ: 4 MHz bandwidth is permitted
 + *    on this channel.
 + * @IEEE80211_CHAN_8MHZ: 8 MHz bandwidth is permitted
 + *    on this channel.
 + * @IEEE80211_CHAN_16MHZ: 16 MHz bandwidth is permitted
 + *    on this channel.
   *
   */
  enum ieee80211_channel_flags {
        IEEE80211_CHAN_NO_20MHZ         = 1<<11,
        IEEE80211_CHAN_NO_10MHZ         = 1<<12,
        IEEE80211_CHAN_NO_HE            = 1<<13,
 +      IEEE80211_CHAN_1MHZ             = 1<<14,
 +      IEEE80211_CHAN_2MHZ             = 1<<15,
 +      IEEE80211_CHAN_4MHZ             = 1<<16,
 +      IEEE80211_CHAN_8MHZ             = 1<<17,
 +      IEEE80211_CHAN_16MHZ            = 1<<18,
  };
  
  #define IEEE80211_CHAN_NO_HT40 \
@@@ -269,23 -254,13 +269,23 @@@ struct ieee80211_rate 
   * struct ieee80211_he_obss_pd - AP settings for spatial reuse
   *
   * @enable: is the feature enabled.
 + * @sr_ctrl: The SR Control field of SRP element.
 + * @non_srg_max_offset: non-SRG maximum tx power offset
   * @min_offset: minimal tx power offset an associated station shall use
   * @max_offset: maximum tx power offset an associated station shall use
 + * @bss_color_bitmap: bitmap that indicates the BSS color values used by
 + *    members of the SRG
 + * @partial_bssid_bitmap: bitmap that indicates the partial BSSID values
 + *    used by members of the SRG
   */
  struct ieee80211_he_obss_pd {
        bool enable;
 +      u8 sr_ctrl;
 +      u8 non_srg_max_offset;
        u8 min_offset;
        u8 max_offset;
 +      u8 bss_color_bitmap[8];
 +      u8 partial_bssid_bitmap[8];
  };
  
  /**
@@@ -474,8 -449,8 +474,9 @@@ struct ieee80211_sta_s1g_cap 
   * @n_bitrates: Number of bitrates in @bitrates
   * @ht_cap: HT capabilities in this band
   * @vht_cap: VHT capabilities in this band
+  * @s1g_cap: S1G capabilities in this band
   * @edmg_cap: EDMG capabilities in this band
 + * @s1g_cap: S1G capabilities in this band (S1B band only, of course)
   * @n_iftype_data: number of iftype data entries
   * @iftype_data: interface type data entries.  Note that the bits in
   *    @types_mask inside this structure cannot overlap (i.e. only
@@@ -704,10 -679,7 +705,10 @@@ struct cfg80211_bitrate_mask 
                u32 legacy;
                u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];
                u16 vht_mcs[NL80211_VHT_NSS_MAX];
 +              u16 he_mcs[NL80211_HE_NSS_MAX];
                enum nl80211_txrate_gi gi;
 +              enum nl80211_he_gi he_gi;
 +              enum nl80211_he_ltf he_ltf;
        } control[NUM_NL80211_BANDS];
  };
  
@@@ -1093,39 -1065,6 +1094,39 @@@ struct cfg80211_acl_data 
        struct mac_address mac_addrs[];
  };
  
 +/**
 + * struct cfg80211_fils_discovery - FILS discovery parameters from
 + * IEEE Std 802.11ai-2016, Annex C.3 MIB detail.
 + *
 + * @min_interval: Minimum packet interval in TUs (0 - 10000)
 + * @max_interval: Maximum packet interval in TUs (0 - 10000)
 + * @tmpl_len: Template length
 + * @tmpl: Template data for FILS discovery frame including the action
 + *    frame headers.
 + */
 +struct cfg80211_fils_discovery {
 +      u32 min_interval;
 +      u32 max_interval;
 +      size_t tmpl_len;
 +      const u8 *tmpl;
 +};
 +
 +/**
 + * struct cfg80211_unsol_bcast_probe_resp - Unsolicited broadcast probe
 + *    response parameters in 6GHz.
 + *
 + * @interval: Packet interval in TUs. Maximum allowed is 20 TU, as mentioned
 + *    in IEEE P802.11ax/D6.0 26.17.2.3.2 - AP behavior for fast passive
 + *    scanning
 + * @tmpl_len: Template length
 + * @tmpl: Template data for probe response
 + */
 +struct cfg80211_unsol_bcast_probe_resp {
 +      u32 interval;
 +      size_t tmpl_len;
 +      const u8 *tmpl;
 +};
 +
  /**
   * enum cfg80211_ap_settings_flags - AP settings flags
   *
@@@ -1173,8 -1112,6 +1174,8 @@@ enum cfg80211_ap_settings_flags 
   * @he_obss_pd: OBSS Packet Detection settings
   * @he_bss_color: BSS Color settings
   * @he_oper: HE operation IE (or %NULL if HE isn't enabled)
 + * @fils_discovery: FILS discovery transmission parameters
 + * @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters
   */
  struct cfg80211_ap_settings {
        struct cfg80211_chan_def chandef;
        u32 flags;
        struct ieee80211_he_obss_pd he_obss_pd;
        struct cfg80211_he_bss_color he_bss_color;
 +      struct cfg80211_fils_discovery fils_discovery;
 +      struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
  };
  
  /**
@@@ -1850,7 -1785,6 +1851,7 @@@ struct mpath_info 
   *    (or NULL for no change)
   * @basic_rates_len: number of basic rates
   * @ap_isolate: do not forward packets between connected stations
 + *    (0 = no, 1 = yes, -1 = do not change)
   * @ht_opmode: HT Operation mode
   *    (u16 = opmode, -1 = do not change)
   * @p2p_ctwindow: P2P CT Window (-1 = no change)
@@@ -2105,27 -2039,6 +2106,27 @@@ struct cfg80211_scan_info 
        bool aborted;
  };
  
 +/**
 + * struct cfg80211_scan_6ghz_params - relevant for 6 GHz only
 + *
 + * @short_bssid: short ssid to scan for
 + * @bssid: bssid to scan for
 + * @channel_idx: idx of the channel in the channel array in the scan request
 + *     which the above info relvant to
 + * @unsolicited_probe: the AP transmits unsolicited probe response every 20 TU
 + * @short_ssid_valid: short_ssid is valid and can be used
 + * @psc_no_listen: when set, and the channel is a PSC channel, no need to wait
 + *       20 TUs before starting to send probe requests.
 + */
 +struct cfg80211_scan_6ghz_params {
 +      u32 short_ssid;
 +      u32 channel_idx;
 +      u8 bssid[ETH_ALEN];
 +      bool unsolicited_probe;
 +      bool short_ssid_valid;
 +      bool psc_no_listen;
 +};
 +
  /**
   * struct cfg80211_scan_request - scan request description
   *
   * @mac_addr_mask: MAC address mask used with randomisation, bits that
   *    are 0 in the mask should be randomised, bits that are 1 should
   *    be taken from the @mac_addr
 + * @scan_6ghz: relevant for split scan request only,
 + *    true if this is the second scan request
 + * @n_6ghz_params: number of 6 GHz params
 + * @scan_6ghz_params: 6 GHz params
   * @bssid: BSSID to scan for (most commonly, the wildcard BSSID)
   */
  struct cfg80211_scan_request {
        struct cfg80211_scan_info info;
        bool notified;
        bool no_cck;
 +      bool scan_6ghz;
 +      u32 n_6ghz_params;
 +      struct cfg80211_scan_6ghz_params *scan_6ghz_params;
  
        /* keep last */
        struct ieee80211_channel *channels[];
@@@ -2566,8 -2472,6 +2567,8 @@@ enum cfg80211_assoc_req_flags 
   * @fils_nonces: FILS nonces (part of AAD) for protecting (Re)Association
   *    Request/Response frame or %NULL if FILS is not used. This field starts
   *    with 16 octets of STA Nonce followed by 16 octets of AP Nonce.
 + * @s1g_capa: S1G capability override
 + * @s1g_capa_mask: S1G capability override mask
   */
  struct cfg80211_assoc_request {
        struct cfg80211_bss *bss;
        const u8 *fils_kek;
        size_t fils_kek_len;
        const u8 *fils_nonces;
 +      struct ieee80211_s1g_cap s1g_capa, s1g_capa_mask;
  };
  
  /**
@@@ -4258,8 -4161,6 +4259,8 @@@ struct cfg80211_ops 
  /**
   * enum wiphy_flags - wiphy capability flags
   *
 + * @WIPHY_FLAG_SPLIT_SCAN_6GHZ: if set to true, the scan request will be split
 + *     into two, first for legacy bands and second for UHB.
   * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this
   *    wiphy at all
   * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled
  enum wiphy_flags {
        WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK         = BIT(0),
        /* use hole at 1 */
 -      /* use hole at 2 */
 +      WIPHY_FLAG_SPLIT_SCAN_6GHZ              = BIT(2),
        WIPHY_FLAG_NETNS_OK                     = BIT(3),
        WIPHY_FLAG_PS_ON_BY_DEFAULT             = BIT(4),
        WIPHY_FLAG_4ADDR_AP                     = BIT(5),
@@@ -5375,16 -5276,6 +5376,16 @@@ ieee80211_channel_to_khz(const struct i
        return MHZ_TO_KHZ(chan->center_freq) + chan->freq_offset;
  }
  
 +/**
 + * ieee80211_s1g_channel_width - get allowed channel width from @chan
 + *
 + * Only allowed for band NL80211_BAND_S1GHZ
 + * @chan: channel
 + * Return: The allowed channel width for this center_freq
 + */
 +enum nl80211_chan_width
 +ieee80211_s1g_channel_width(const struct ieee80211_channel *chan);
 +
  /**
   * ieee80211_channel_to_freq_khz - convert channel number to frequency
   * @chan: channel number
This page took 0.192889 seconds and 4 git commands to generate.