From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Apr 2009 18:31:28 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-5.2.0-15.16~29790
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8255309b887fcac11f791913a2d1d0b966a40d32;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing/filters: return proper error code when writing filter file
  tracing/filters: allow user input integer to be oct or hex
  tracing/filters: fix NULL pointer dereference
  tracing/filters: NIL-terminate user input filter
  ftrace: Output REC->var instead of __entry->var for trace format
  Make __stringify support variable argument macros too
  tracing: fix document references
  tracing: fix splice return too large
  tracing: update file->f_pos when splice(2) it
  tracing: allocate page when needed
  tracing: disable seeking for trace_pipe_raw
---

8255309b887fcac11f791913a2d1d0b966a40d32