staging/lustre: change Lustre URLs and mailing list

Now that the lustre.org domain has been liberated we can again
use that for the main website URL and mailing list.

Also update the URL for userspace tools downloads and Git repo.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 8 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7ba7ab749c85..c4c7804fb8e3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9904,8 +9904,8 @@ F:	drivers/staging/media/lirc/
 STAGING - LUSTRE PARALLEL FILESYSTEM
 M:      Oleg Drokin <oleg.drokin@intel.com>
 M:      Andreas Dilger <andreas.dilger@intel.com>
-L:      HPDD-discuss@lists.01.org (moderated for non-subscribers)
-W:      http://lustre.opensfs.org/
+L:      lustre-devel@lists.lustre.org (moderated for non-subscribers)
+W:      http://wiki.lustre.org/
 S:      Maintained
 F:      drivers/staging/lustre
 
diff --git a/drivers/staging/lustre/README.txt b/drivers/staging/lustre/README.txt
index cf0ca50ff83b..0676243eea9e 100644
--- a/drivers/staging/lustre/README.txt
+++ b/drivers/staging/lustre/README.txt
@@ -14,10 +14,8 @@ Unlike shared disk storage cluster filesystems (e.g. OCFS2, GFS, GPFS),
 Lustre has independent Metadata and Data servers that clients can access
 in parallel to maximize performance.
 
-In order to use Lustre client you will need to download lustre client
-tools from
-https://downloads.hpdd.intel.com/public/lustre/latest-feature-release/
-the package name is lustre-client.
+In order to use Lustre client you will need to download the "lustre-client"
+package that contains the userspace tools from http://lustre.org/download/
 
 You will need to install and configure your Lustre servers separately.
 
@@ -76,12 +74,10 @@ Mount Options
 
 More Information
 ================
-You can get more information at
-OpenSFS website: http://lustre.opensfs.org/about/
-Intel HPDD wiki: https://wiki.hpdd.intel.com
+You can get more information at the Lustre website: http://wiki.lustre.org/
 
-Out of tree Lustre client and server code is available at:
-http://git.whamcloud.com/fs/lustre-release.git
+Source for the userspace tools and out-of-tree client and server code
+is available at: http://git.hpdd.intel.com/fs/lustre-release.git
 
 Latest binary packages:
-http://lustre.opensfs.org/download-lustre/
+http://lustre.org/download/