Merge tag 'mlx5-fixes-2022-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git...

Saeed Mahameed says:

====================
mlx5 fixes 2022-06-08

This series provides bug fixes to mlx5 driver.

* tag 'mlx5-fixes-2022-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: fs, fail conflicting actions
  net/mlx5: Rearm the FW tracer after each tracer event
  net/mlx5: E-Switch, pair only capable devices
  net/mlx5e: CT: Fix cleanup of CT before cleanup of TC ct rules
  Revert "net/mlx5e: Allow relaxed ordering over VFs"
  MAINTAINERS: adjust MELLANOX ETHERNET INNOVA DRIVERS to TLS support removal
====================

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>

diff --combined MAINTAINERS
index e42b5d043588a86b1730cb31d2407b5be6a25a91,bab9e131ec9c2b84f242b16f30c8ba3136e8886d..39e78f58b0aa7cca971b2aa0a690843ed1d76a33
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1090,14 -1090,6 +1090,14 @@@ W:    https://ez.analog.com/linux-software
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 +ANALOG DEVICES INC AD3552R DRIVER
 +M:    Nuno Sá <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
 +F:    drivers/iio/dac/ad3552r.c
 +
  ANALOG DEVICES INC AD7293 DRIVER
  M:    Antoniu Miclaus <[email protected]>
  L:    [email protected]
@@@ -1838,7 -1830,6 +1838,7 @@@ F:      Documentation/devicetree/bindings/io
  F:    Documentation/devicetree/bindings/iommu/apple,sart.yaml
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
  F:    Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
 +F:    Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    Documentation/devicetree/bindings/power/apple*
@@@ -1851,7 -1842,6 +1851,7 @@@ F:      drivers/iommu/apple-dart.
  F:    drivers/irqchip/irq-apple-aic.c
  F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/nvme/host/apple.c
 +F:    drivers/nvmem/apple-efuses.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    drivers/soc/apple/*
  F:    drivers/watchdog/apple_wdt.c
@@@ -2135,18 -2125,6 +2135,18 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    arch/arm/mach-sa1100/include/mach/jornada720.h
  F:    arch/arm/mach-sa1100/jornada720.c
  
 +ARM/HPE GXP ARCHITECTURE
 +M:    Jean-Marie Verdun <[email protected]>
 +M:    Nick Hawkins <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 +F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
 +F:    arch/arm/boot/dts/hpe-bmc*
 +F:    arch/arm/boot/dts/hpe-gxp*
 +F:    arch/arm/mach-hpe/
 +F:    drivers/clocksource/timer-gxp.c
 +F:    drivers/watchdog/gxp-wdt.c
 +
  ARM/IGEP MACHINE SUPPORT
  M:    Enric Balletbo i Serra <[email protected]>
  M:    Javier Martinez Canillas <[email protected]>
@@@ -2565,7 -2543,7 +2565,7 @@@ F:      drivers/pci/controller/dwc/pcie-qcom
  F:    drivers/phy/qualcomm/
  F:    drivers/power/*/msm*
  F:    drivers/reset/reset-qcom-*
 -F:    drivers/scsi/ufs/ufs-qcom*
 +F:    drivers/ufs/host/ufs-qcom*
  F:    drivers/spi/spi-geni-qcom.c
  F:    drivers/spi/spi-qcom-qspi.c
  F:    drivers/spi/spi-qup.c
@@@ -3533,14 -3511,10 +3533,14 @@@ R:   Andy Shevchenko <andriy.shevchenko@l
  R:    Rasmus Villemoes <[email protected]>
  S:    Maintained
  F:    include/linux/bitmap.h
 +F:    include/linux/cpumask.h
  F:    include/linux/find.h
 +F:    include/linux/nodemask.h
  F:    lib/bitmap.c
 +F:    lib/cpumask.c
  F:    lib/find_bit.c
  F:    lib/find_bit_benchmark.c
 +F:    lib/nodemask.c
  F:    lib/test_bitmap.c
  F:    tools/include/linux/bitmap.h
  F:    tools/include/linux/find.h
@@@ -3757,13 -3731,6 +3757,13 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
 +BPFTOOL
 +M:    Quentin Monnet <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/disasm.*
 +F:    tools/bpf/bpftool/
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
@@@ -7738,7 -7705,6 +7738,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 +M:    Russ Weight <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -7807,7 -7773,7 +7807,7 @@@ R:      Tom Rix <[email protected]
  L:    [email protected]
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git
  F:    Documentation/devicetree/bindings/fpga/
  F:    Documentation/driver-api/fpga/
  F:    Documentation/fpga/
@@@ -8433,7 -8399,7 +8433,7 @@@ M:      Mika Westerberg <mika.westerberg@lin
  M:    Andy Shevchenko <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    Documentation/firmware-guide/acpi/gpio-properties.rst
  F:    drivers/gpio/gpiolib-acpi.c
@@@ -9084,16 -9050,8 +9084,16 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/input/touchscreen/htcpen.c
  
 +HTE SUBSYSTEM
 +M:    Dipen Patel <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/timestamp/
 +F:    Documentation/hte/
 +F:    drivers/hte/
 +F:    include/linux/hte.h
 +
  HTS221 TEMPERATURE-HUMIDITY IIO DRIVER
 -M:    Lorenzo Bianconi <lorenzo[email protected]>
 +M:    Lorenzo Bianconi <lorenzo@kernel.org>
  L:    [email protected]
  S:    Maintained
  W:    http://www.st.com/
@@@ -9906,7 -9864,7 +9906,7 @@@ F:      drivers/video/fbdev/intelfb
  INTEL GPIO DRIVERS
  M:    Andy Shevchenko <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-ich.c
  F:    drivers/gpio/gpio-merrifield.c
@@@ -10127,7 -10085,7 +10127,7 @@@ F:   drivers/platform/x86/intel/pmc
  
  INTEL PMIC GPIO DRIVERS
  M:    Andy Shevchenko <[email protected]>
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-*cove.c
  
@@@ -11584,16 -11542,6 +11584,16 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
  F:    drivers/gpu/drm/bridge/lontium-lt8912b.c
  
 +LOONGARCH
 +M:    Huacai Chen <[email protected]>
 +R:    WANG Xuerui <[email protected]>
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
 +F:    arch/loongarch/
 +F:    drivers/*/*loongarch*
 +F:    Documentation/loongarch/
 +F:    Documentation/translations/zh_CN/loongarch/
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <[email protected]>
  M:    Sreekanth Reddy <[email protected]>
@@@ -12703,7 -12651,6 +12703,6 @@@ L:   [email protected]
  S:    Supported
  W:    http://www.mellanox.com
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
- F:    drivers/net/ethernet/mellanox/mlx5/core/accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
@@@ -12942,7 -12889,7 +12941,7 @@@ F:   arch/arm64/boot/dts/marvell/armada-3
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
 -R:    Hemant Kumar <[email protected]>
 +R:    Hemant Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -13451,7 -13398,7 +13450,7 @@@ F:   drivers/net/phy/motorcomm.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
 -F:    Documentation/driver-api/serial/moxa-smartio.rst
 +F:    Documentation/driver-api/tty/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -17762,7 -17709,6 +17761,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
  F:    Documentation/devicetree/bindings/scsi/
  F:    drivers/scsi/
 +F:    drivers/ufs/
  F:    include/scsi/
  
  SCSI TAPE DRIVER
@@@ -18835,7 -18781,7 +18834,7 @@@ S:   Maintaine
  F:    arch/alpha/kernel/srm_env.c
  
  ST LSM6DSx IMU IIO DRIVER
 -M:    Lorenzo Bianconi <lorenzo[email protected]>
 +M:    Lorenzo Bianconi <lorenzo@kernel.org>
  L:    [email protected]
  S:    Maintained
  W:    http://www.st.com/
@@@ -20419,28 -20365,35 +20418,28 @@@ F:        drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  F:    include/uapi/linux/cdrom.h
  
 -UNISYS S-PAR DRIVERS
 -M:    David Kershner <[email protected]>
 -L:    [email protected] (Unisys internal)
 -S:    Supported
 -F:    drivers/staging/unisys/
 -F:    drivers/visorbus/
 -F:    include/linux/visorbus.h
 -
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  R:    Alim Akhtar <[email protected]>
  R:    Avri Altman <[email protected]>
 +R:    Bart Van Assche <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/ufs/
  F:    Documentation/scsi/ufs.rst
 -F:    drivers/scsi/ufs/
 +F:    drivers/ufs/core/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
  M:    Pedro Sousa <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/scsi/ufs/*dwc*
 +F:    drivers/ufs/host/*dwc*
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
  M:    Stanley Chu <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/scsi/ufs/ufs-mediatek*
 +F:    drivers/ufs/host/ufs-mediatek*
  
  UNSORTED BLOCK IMAGES (UBI)
  M:    Richard Weinberger <[email protected]>
@@@ -21088,7 -21041,6 +21087,7 @@@ F:   include/uapi/linux/virtio_crypto.
  VIRTIO DRIVERS FOR S390
  M:    Cornelia Huck <[email protected]>
  M:    Halil Pasic <[email protected]>
 +M:    Eric Farman <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -21239,7 -21191,7 +21238,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/vme.rst
 -F:    drivers/staging/vme/
 +F:    drivers/staging/vme_user/
  F:    drivers/vme/
  F:    include/linux/vme*
  
@@@ -21765,29 -21717,23 +21764,29 @@@ F:        arch/arm64/include/asm/xen
  F:    arch/arm64/xen/
  
  XEN HYPERVISOR INTERFACE
 -M:    Boris Ostrovsky <[email protected]>
  M:    Juergen Gross <[email protected]>
 -R:    Stefano Stabellini <[email protected]>
 +M:    Stefano Stabellini <[email protected]>
 +R:    Oleksandr Tyshchenko <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  F:    Documentation/ABI/stable/sysfs-hypervisor-xen
  F:    Documentation/ABI/testing/sysfs-hypervisor-xen
 -F:    arch/x86/include/asm/pvclock-abi.h
 -F:    arch/x86/include/asm/xen/
 -F:    arch/x86/platform/pvh/
 -F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
  F:    drivers/xen/
  F:    include/uapi/xen/
  F:    include/xen/
  
 +XEN HYPERVISOR X86
 +M:    Juergen Gross <[email protected]>
 +R:    Boris Ostrovsky <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/x86/include/asm/pvclock-abi.h
 +F:    arch/x86/include/asm/xen/
 +F:    arch/x86/platform/pvh/
 +F:    arch/x86/xen/
 +
  XEN NETWORK BACKEND DRIVER
  M:    Wei Liu <[email protected]>
  M:    Paul Durrant <[email protected]>
@@@ -22009,13 -21955,6 +22008,13 @@@ L: [email protected]
  S:    Maintained
  F:    mm/zbud.c
  
 +Z3FOLD COMPRESSED PAGE ALLOCATOR
 +M:    Vitaly Wool <[email protected]>
 +R:    Miaohe Lin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    mm/z3fold.c
 +
  ZD1211RW WIRELESS DRIVER
  M:    Ulrich Kunitz <[email protected]>
  L:    [email protected]