summaryrefslogtreecommitdiff
path: root/tools/perf/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perf/.gitignore')
0 files changed, 0 insertions, 0 deletions
7cd (diff)parent5abf186a30a89d5b9c18a6bf93a2c192c9fd52f6 (diff)
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "8 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm, fs: check for fatal signals in do_generic_file_read() fs: break out of iomap_file_buffered_write on fatal signals base/memory, hotplug: fix a kernel oops in show_valid_zones() mm/memory_hotplug.c: check start_pfn in test_pages_in_a_zone() jump label: pass kbuild_cflags when checking for asm goto support shmem: fix sleeping from atomic context kasan: respect /proc/sys/kernel/traceoff_on_warning zswap: disable changing params if init fails
Diffstat (limited to 'fs')
-rw-r--r--fs/dax.c5
-rw-r--r--fs/iomap.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/fs/dax.c b/fs/dax.c