From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 28 Jun 2011 22:50:53 +0000 (-0400)
Subject: Merge branch 'master' of git.lttng.org:/home/git/lttv
X-Git-Tag: v1.5-beta1~109
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=1b6b471ad884137b6fa2f2fbea1be7da1aa8fe77;hp=-c;p=lttv.git

Merge branch 'master' of git.lttng.org:/home/git/lttv

Conflicts:
	doc/developer/lttng-lttv-compatibility.html
---

1b6b471ad884137b6fa2f2fbea1be7da1aa8fe77
diff --combined doc/developer/lttng-lttv-compatibility.html
index 44dd9864,194364f7..cbead46e
--- a/doc/developer/lttng-lttv-compatibility.html
+++ b/doc/developer/lttng-lttv-compatibility.html
@@@ -4016,6 -4016,7 +4016,7 @@@ powerpc64, s390, sparc, sparc64.<br
  ...<br>
  0.87<br>
  0.88<br>
+ 0.89<br>
  </td>
  <td style="vertical-align: top;">
  0.16<br>
@@@ -4084,6 -4085,7 +4085,7 @@@ powerpc64, s390, sparc, sparc64.<br
  ...<br>
  0.87<br>
  0.88<br>
+ 0.89<br>
  </td>
  <td style="vertical-align: top;">
  0.19.1<br>
@@@ -4134,6 -4136,7 +4136,7 @@@ linaro-0.239-1<br
  ...<br>
  0.87<br>
  0.88<br>
+ 0.89<br>
  </td>
  <td style="vertical-align: top;">
  0.19.2<br>
@@@ -4141,6 -4144,12 +4144,12 @@@
  </td>
  <td style="vertical-align: top;">
  0.6<br>
+ 0.7<br>
+ 0.8<br>
+ 0.9<br>
+ 0.10<br>
+ 0.11<br>
+ 0.12<br>
  </td>
  <td style="vertical-align: top;">
  obsolete<br>
@@@ -4194,6 -4203,7 +4203,7 @@@ linaro-0.244-1<br
  ...<br>
  0.87<br>
  0.88<br>
+ 0.89<br>
  </td>
  <td style="vertical-align: top;">
  0.19.4<br>
@@@ -4202,6 -4212,12 +4212,12 @@@
  </td>
  <td style="vertical-align: top;">
  0.6<br>
+ 0.7<br>
+ 0.8<br>
+ 0.9<br>
+ 0.10<br>
+ 0.11<br>
+ 0.12<br>
  </td>
  <td style="vertical-align: top;">
  obsolete<br>
@@@ -4247,24 -4263,35 +4263,37 @@@ powerpc64, s390, sparc, sparc64.<br
  0.12.35<br>
  0.12.36<br>
  0.12.37<br>
+ 0.12.38<br>
  </td>
  <td style="vertical-align: top;">
  0.246<br>
  0.247<br>
+ 0.248<br>
+ 0.249<br>
  </td>
  <td style="vertical-align: top;">
  0.76<br>
  ...<br>
  0.87<br>
  0.88<br>
+ 0.89<br>
  </td>
  <td style="vertical-align: top;">
  0.19.7<br>
  0.19.8<br>
+ 0.19.9<br>
+ 0.19.10<br>
  </td>
  <td style="vertical-align: top;">
+ 0.6<br>
+ 0.7<br>
+ 0.8<br>
+ 0.9<br>
+ 0.10<br>
+ 0.11<br>
+ 0.12<br>
 +0.13<br>
 +0.14<br>
  </td>
  <td style="vertical-align: top;">
  obsolete<br>
@@@ -4274,11 -4301,22 +4303,22 @@@
  </td>
  <td style="vertical-align: top;">
  2.6.38<br>
+ 2.6.38.2<br>
+ 2.6.38.6<br>
  </td>
  <td style="vertical-align: top;">
  LTTng 0.246 and lttng-modules 0.19.7 support Linux 2.6.38.<br>
  LTTng 0.247 and lttng-modules 0.19.8 add back MAYBE_BUILD_BUG_ON specifically
  for lttng modules and fix a prototype mismatch warning.<br>
+ LTTV 0.12.38 fixes a bug in state.c raise softirq handling of softirq IDs larger
+ than 31 (this was a bug in fallback code), which causes segmentation faults when
+ viewing traces recorded on a 2.6.38 kernel.<br>
+ LTTng 0.248 supports kernel 2.6.38.2, fixes a quilt vs git lockdep patch hunk
+ error (all quilt patches refreshed), merges OMAP4 trace clock fix.<br>
+ lttng-modules 0.19.9 is a bugfix release, fixes incorrect handling of disabled
+ channels.<br>
+ lttng-modules 0.19.10 and LTTng 0.249 add dup() instrumentation and fixes
+ socket_sendmsg probe name typo. LTTng 0.249 is based on kernel 2.6.38.6.<br>
  </td>
  <td style="vertical-align: top;">
  </td>