This one is still in base64, which does not work with git-am. I'll fetch from git.
Thanks, Mathieu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: lttng-dev-boun...@lists.lttng.org Sender: "lttng-dev" <lttng-dev-boun...@lists.lttng.org> U3RhcnRpbmcgZnJvbSA0LjEzLjAtMzggdGhlIHVidW50dSBrZXJuZWwgYmFja3BvcnQgYSBrdm0g aW5zdHJ1bWVudGF0aW9uCmNoYW5nZSBpbnRyb2R1Y2VkIGluIDQuMTUgd2hpY2ggYWZmZWN0cyB0 aGUgcHJvdG90eXBlIG9mIHRoZSBrdm1fbW1pbyBldmVudC4KClNpZ25lZC1vZmYtYnk6IEtoYWxp ZCBFbG1vdXNseSA8a2hhbGlkLmVsbW91c2x5QGNhbm9uaWNhbC5jb20+Ci0tLQogaW5zdHJ1bWVu dGF0aW9uL2V2ZW50cy9sdHRuZy1tb2R1bGUva3ZtLmggfCAxICsKIDEgZmlsZSBjaGFuZ2VkLCAx IGluc2VydGlvbigrKQoKZGlmZiAtLWdpdCBhL2luc3RydW1lbnRhdGlvbi9ldmVudHMvbHR0bmct bW9kdWxlL2t2bS5oIGIvaW5zdHJ1bWVudGF0aW9uL2V2ZW50cy9sdHRuZy1tb2R1bGUva3ZtLmgK aW5kZXggOGY5YTEzMi4uYTU5ODJjOSAxMDA2NDQKLS0tIGEvaW5zdHJ1bWVudGF0aW9uL2V2ZW50 cy9sdHRuZy1tb2R1bGUva3ZtLmgKKysrIGIvaW5zdHJ1bWVudGF0aW9uL2V2ZW50cy9sdHRuZy1t b2R1bGUva3ZtLmgKQEAgLTkyLDYgKzkyLDcgQEAgTFRUTkdfVFJBQ0VQT0lOVF9FVkVOVChrdm1f YWNrX2lycSwKIAl8fCBMVFROR19LRVJORUxfUkFOR0UoNCwxLDUwLCA0LDIsMCkgXAogCXx8IExU VE5HX0tFUk5FTF9SQU5HRSgzLDE2LDUyLCAzLDE3LDApIFwKIAl8fCBMVFROR19LRVJORUxfUkFO R0UoMywyLDk3LCAzLDMsMCkgXAorCXx8IExUVE5HX1VCVU5UVV9LRVJORUxfUkFOR0UoNCwxMywx NiwzOCwgNCwxNCwwLDApIFwKIAl8fCBMVFROR19ERUJJQU5fS0VSTkVMX1JBTkdFKDQsOSw2NSww LDMsMCwgNCwxMCwwLDAsMCwwKSBcCiAJfHwgTFRUTkdfRkVET1JBX0tFUk5FTF9SQU5HRSg0LDE0 LDEzLDMwMCwgNCwxNSwwLDApKQogCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmx0dG5nLWRldiBtYWlsaW5nIGxpc3QKbHR0bmctZGV2 QGxpc3RzLmx0dG5nLm9yZwpodHRwczovL2xpc3RzLmx0dG5nLm9yZy9jZ2ktYmluL21haWxtYW4v bGlzdGluZm8vbHR0bmctZGV2Cg== ----- On Mar 24, 2018, at 9:36 PM, Khalid Elmously khalid.elmou...@canonical.com wrote: > Starting from 4.13.0-38 the ubuntu kernel backport a kvm instrumentation > change introduced in 4.15 which affects the prototype of the kvm_mmio event. > > Signed-off-by: Khalid Elmously <khalid.elmou...@canonical.com> > --- > instrumentation/events/lttng-module/kvm.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/instrumentation/events/lttng-module/kvm.h > b/instrumentation/events/lttng-module/kvm.h > index 8f9a132..a5982c9 100644 > --- a/instrumentation/events/lttng-module/kvm.h > +++ b/instrumentation/events/lttng-module/kvm.h > @@ -92,6 +92,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq, > || LTTNG_KERNEL_RANGE(4,1,50, 4,2,0) \ > || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \ > || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \ > + || LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,0,0) \ > || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \ > || LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0)) > > -- > 2.14.1 > > _______________________________________________ > lttng-dev mailing list > lttng-dev@lists.lttng.org > https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
