Merge branch 'f23' into f21

* f23:
  upstream release 2.9
  Rebuilt for librpm soname bump
  Automated weekly systemtap rawhide release: 0.20150713git9d0b65f
  Automated weekly systemtap rawhide release: 0.20150707git86f726b
  Automated weekly systemtap rawhide release: 0.20150707git320e1ec

Conflicts:
	systemtap.spec

.gitignore

@@ -111,6 +111,7 @@ systemtap-1.3.tar.gz
 /systemtap-2.6-0.240.g876abb05c522.tar.gz
 /systemtap-2.6-0.299.gefa3ced615cc.tar.gz
 /systemtap-2.6-0.411.gdf6c01e780a2.tar.gz
+/systemtap-2.6.tar.gz
 /systemtap-2.6-0.413.g6c14086f35f6.tar.gz
 /systemtap-2.6-0.417.ga799c319d22f.tar.gz
 /systemtap-2.6.tar.gz

systemtap-2.8-bz1240682.patch

@@ -0,0 +1,33 @@
+commit 320e1ecb16427b5769f0f5a097d80823ee1fb765
+Author: David Smith <dsmith@redhat.com>
+Date:   Tue Jul 7 10:41:43 2015 -0500
+
+    Fixed BZ1240682 by fixing a rawhide compile problem.
+    
+    * translate.cxx (translate_pass): Move the inclusion of runtime.h up
+      before the declaration of the module refresh mutex, to avoid compilation
+      problems on rawhide.
+
+diff --git a/translate.cxx b/translate.cxx
+index c8230f2..390a73e 100644
+--- a/translate.cxx
++++ b/translate.cxx
+@@ -7944,6 +7944,9 @@ translate_pass (systemtap_session& s)
+       // Emit systemtap_module_refresh() prototype so we can reference it
+       s.op->newline() << "static void systemtap_module_refresh (const char* modname);";
+ 
++      // Be sure to include runtime.h before any real code.
++      s.op->newline() << "#include \"runtime.h\"";
++
+       if (!s.runtime_usermode_p())
+         {
+           // When on-the-fly [dis]arming is used, module_refresh can be called from
+@@ -7962,8 +7965,6 @@ translate_pass (systemtap_session& s)
+           s.op->newline() << "#endif";
+         }
+ 
+-      s.op->newline() << "#include \"runtime.h\"";
+-
+       // Emit embeds ahead of time, in case they affect context layout
+       for (unsigned i=0; i<s.embeds.size(); i++)
+         {

systemtap.spec

@@ -1021,9 +1021,15 @@ done
 * Thu Oct 08 2015 Frank Ch. Eigler <fche@redhat.com> - 2.9-1
 - Upstream release.
 
+* Wed Sep 16 2015 David Smith <dsmith@redhat.com> - 2.8-2
+- Fix support for kernel 4.2 (BZ1240682).
+
 * Wed Jun 17 2015 Abegail Jakop <ajakop@redhat.com> - 2.8-1
 - Upstream release.
 
+* Tue May 12 2015 Josh Stone <jistone@redhat.com> - 2.7-2
+- Disable ICF when checking for available tracepoints.
+
 * Wed Feb 18 2015 Frank Ch. Eigler <fche@redhat.com> - 2.7-1
 - Upstream release.