Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
From: dgoulet@efficios.com (David Goulet)
Subject: [lttng-dev] [PATCH lttng-tools 1/2] Fix: syscall list ioctl number conflict
Date: Fri, 31 Oct 2014 16:22:32 -0400	[thread overview]
Message-ID: <20141031202232.GF24977@dalia> (raw)
In-Reply-To: <1413845433-24348-1-git-send-email-mathieu.desnoyers@efficios.com>

merged in 2.6.0-rc2

David

On 20 Oct (18:50:32), Mathieu Desnoyers wrote:
> 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 c88f970..475a066 100644
> --- a/src/common/kernel-ctl/kernel-ioctl.h
> +++ b/src/common/kernel-ctl/kernel-ioctl.h
> @@ -103,7 +103,7 @@
>  #define LTTNG_KERNEL_WAIT_QUIESCENT		_IO(0xF6, 0x48)
>  #define LTTNG_KERNEL_CALIBRATE			\
>  	_IOWR(0xF6, 0x49, struct lttng_kernel_calibrate)
> -#define LTTNG_KERNEL_SYSCALL_LIST		_IO(0xF6, 0x49)
> +#define LTTNG_KERNEL_SYSCALL_LIST		_IO(0xF6, 0x4A)
>  
>  /* Session FD ioctl */
>  #define LTTNG_KERNEL_METADATA			\
> -- 
> 2.1.0
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20141031/9dd46ed1/attachment.sig>


           reply	other threads:[~2014-10-31 20:22 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <1413845433-24348-1-git-send-email-mathieu.desnoyers@efficios.com>]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141031202232.GF24977@dalia \
    --to=dgoulet@efficios.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox