Merge branch 'master' of git://git.openfabrics.org/~jays/ofed_scripts

diff --cc install.pl
index e94ce95e8bec4f1d7225cafdb38ad48c79e7d457,c4e872a6da00d6e249743a126cb49b594f16ee7d..436b995e4316f4ab2389fc010c7489496b18c7a0
--- 1/install.pl
--- 2/install.pl
+++ b/install.pl
@@@ -609,19 -609,9 +609,19 @@@ my @mlnx_en_packages = 
                         "mlnx_en", "mlnx-en-devel", "mlnx_en-devel", "mlnx_en-doc", "mlnx-ofc", "mlnx-ofc-debuginfo"
                          );
  
 +my @chelsio_uwire_packages = (
 +                      "bonding", "chcr", "chelsio-series4-firmware", "chelsio-utils", "chiscsi", "chiwarp",
 +                      "csiostor-initiator", "cxgb4", "cxgb4i", "cxgb4toe", "cxgb4vf", "libcxgb4", "libcxgb4-devel",
 +                      "libcxgb4_sock", "libcxgb4_sock_debug", "libcxgb4_udp", "libcxgb4_udp_debug", "sniffer",
 +                      "cxgb4nic", "cxgb4toe-ipv4", "cxgbit", "oiscsi-utils", "libiwpm", "libiwpm-debuginfo",
 +                      "chopenssl", "chopenssl-devel", "chopenssl-doc", "libcxgb4-debuginfo", "cxgb4toe-udpso",
 +                      "cxgb4ipv6", "chtrace", "chfilter", "csiostor-target", "cxgb4wdtoe", "libwdtoe", "libwdtoe_dbg",
 +                      "bypass", "chelsio-bypass-utils", "chfcoe", "rdma-block-device"
 +                      );
 +
  # List of all available packages sorted following dependencies
  my @kernel_packages = ("compat-rdma", "compat-rdma-devel", "ib-bonding", "ib-bonding-debuginfo");
- my @basic_kernel_modules = ("core", "mthca", "mlx4", "mlx4_en", "mlx5", "cxgb3", "cxgb4", "nes", "ehca", "qib", "ocrdma", "ipoib");
+ my @basic_kernel_modules = ("core", "mthca", "mlx4", "mlx4_en", "mlx5", "cxgb3", "cxgb4", "nes", "ehca", "qib", "ocrdma", "ipoib", "nvme", "nvme-host", "nvme-target");
  my @ulp_modules = ("sdp", "srp", "srpt", "rds", "qlgc_vnic", "iser", "nfsrdma", "cxgb3i", "cxgb4i");
  my @xeon_phi_kernel = ("ibscif", "ibp-server", "ibp-debug");