Merge master into staging-next

2021-03-11 12:21:28 +00:00
parent 31dc9fe457 0213d5f933
commit b4d5951d9e
33 changed files with 388 additions and 64 deletions
@@ -772,6 +772,8 @@ let
      MLX4_EN_VXLAN = whenOlder "4.8" yes;
      MLX5_CORE_EN       = option yes;

+      NVME_MULTIPATH = whenAtLeast "4.15" yes;
+
      PSI = whenAtLeast "4.20" yes;

      MODVERSIONS        = whenOlder "4.9" yes;