Merged in master, thanks!

Jérémie

On 5 October 2016 at 12:54, Mathieu Desnoyers
<mathieu.desnoyers at efficios.com> wrote:
> Follow lttng-modules upstream.
>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
>  src/common/kernel-ctl/kernel-ioctl.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/common/kernel-ctl/kernel-ioctl.h b/src/common/kernel-ctl/kernel-ioctl.h
> index 805de02..e235d10 100644
> --- a/src/common/kernel-ctl/kernel-ioctl.h
> +++ b/src/common/kernel-ctl/kernel-ioctl.h
> @@ -20,7 +20,7 @@
>  #define _LTT_KERNEL_IOCTL_H
>
>  #define LTTNG_MODULES_ABI_MAJOR_VERSION                2
> -#define LTTNG_MODULES_ABI_MINOR_VERSION                1
> +#define LTTNG_MODULES_ABI_MINOR_VERSION                2
>
>  /* Get a snapshot of the current ring buffer producer and consumer positions */
>  #define RING_BUFFER_SNAPSHOT                _IO(0xF6, 0x00)
> --
> 2.1.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com