summaryrefslogtreecommitdiffstats
path: root/include/trace/perf.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-01 13:57:27 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-01 13:57:27 +0200
commitf97b870eced0ec562f953d32eda03906c7dacad6 (patch)
tree232ce6b9dc47eecd3f69cf64b0018431397009cc /include/trace/perf.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff)
parentUBI: return ENOSPC if no enough space available (diff)
downloadlinux-f97b870eced0ec562f953d32eda03906c7dacad6.tar.xz
linux-f97b870eced0ec562f953d32eda03906c7dacad6.zip
Merge tag 'upstream-4.3-rc4' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS fixes from Richard Weinberger: "This contains three bug fixes for both UBI and UBIFS" * tag 'upstream-4.3-rc4' of git://git.infradead.org/linux-ubifs: UBI: return ENOSPC if no enough space available UBI: Validate data_size UBIFS: Kill unneeded locking in ubifs_init_security
Diffstat (limited to 'include/trace/perf.h')
0 files changed, 0 insertions, 0 deletions