Merge pull request #510 from bgoglin/master

hwloc 2.11.2 final

index.php

@@ -92,9 +92,9 @@ function pr($name, $url, $comma) {
 news("Open MPI v4.1.6 released",
      "Bug fix release",
      "https://www.mail-archive.com/[email protected]/msg00158.html");
-news("hwloc 2.11.1",
+news("hwloc 2.11.2",
      "Stable release",
-     "https://www.mail-archive.com/[email protected]/msg00167.html");
+     "https://www.mail-archive.com/[email protected]/msg00169.html");
 ?>
 </td>
 </tr>

projects/hwloc/doc/index.php

@@ -36,7 +36,7 @@ function print_docs($desc, $letterpdf, $a4pdf, $html) {
 
 #########################################################
 
-$versions = array("v2.11.1", "v2.11.0");
+$versions = array("v2.11.2", "v2.11.1", "v2.11.0");
 $first = 1;
 foreach ($versions as $key => $v) {
     print_docs("Release $v (stable" . (!$first ? ", old" : "") . ")",

projects/hwloc/doc/v2.11.2rc1/a00351.php → projects/hwloc/doc/v2.11.2/a00351.php

@@ -74,7 +74,7 @@
 <dt>FrequencyMaxMHz (Linux) </dt>
 <dd>The maximal operating frequency of the core, as reported by <code>cpufreq</code> drivers on Linux.  </dd>
 <dt>FrequencyBaseMHz (Linux) </dt>
-<dd>The base operating frequency of the core, as reported by some <code>cpufreq</code> drivers on Linux (e.g. <code>intel_pstate</code>).  </dd>
+<dd>The base/nominal operating frequency of the core, as reported by some <code>cpufreq</code> or ACPI drivers on Linux (e.g. <code>cpufreq_cppc</code> or <code>intel_pstate</code>).  </dd>
 <dt>CoreType (x86) </dt>
 <dd>A string describing the kind of core, currently <code>IntelAtom</code> or <code>IntelCore</code>, as reported by the x86 CPUID instruction and Linux PMU on some Intel processors.  </dd>
 <dt>LinuxCapacity (Linux) </dt>

projects/hwloc/index.php

@@ -16,15 +16,15 @@
 <div style="float: right; clear: both"><!-- "clear: both" prevents news from going near the float image above -->
 <?php
 # Lists are not mirrored - use an absolute URL
-news("hwloc 2.11.2rc1",
-     "Stable release candidate",
-     "https://www.mail-archive.com/[email protected]/msg00168.html");
+news("hwloc 2.11.2",
+     "Stable release",
+     "https://www.mail-archive.com/[email protected]/msg00169.html");
 news("hwloc 2.11.1",
      "Stable release",
      "https://www.mail-archive.com/[email protected]/msg00167.html");
 news("Upgrading to v2.0 API",
      "Guide for Porting your Code",
-     "doc/v2.11.0/a00359.php");
+     "doc/v2.11.2/a00360.php");
 news("XML topology database",
      "Repository of XML topologies",
      "https://hwloc.gitlabpages.inria.fr/xmls/");

software/hwloc/v2.11/version.inc

@@ -11,8 +11,8 @@ $download_prefix="https://download.open-mpi.org/release/hwloc/v" . $release_seri
 $s3_prefix = "release/hwloc/v" . $release_series . "/";
 
 /* releases must be ordered newest to oldest */
-$releases = array("2.11.1", "2.11.0");
+$releases = array("2.11.2", "2.11.1", "2.11.0");
 /* prereleases must be ordered newest to oldest.  All prereleases
    will be shown, so make an empty array when the official release
    is added to releases above */
-$prereleases = array("2.11.2rc1");
+$prereleases = array();