diff options
author | 2018-10-13 09:31:19 +0200 | |
---|---|---|
committer | 2018-10-13 09:31:19 +0200 | |
commit | 79fc170b1f5c36f486d886bfbd59eb4e62321128 (patch) | |
tree | cb16b5f0a0b4f96e86301c061021d0ba5ea78c00 /tools/perf/scripts/python/export-to-sqlite.py | |
parent | Merge tag 'for-linus-20181012' of git://git.kernel.dk/linux-block (diff) | |
parent | fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters() (diff) | |
download | linux-dev-79fc170b1f5c36f486d886bfbd59eb4e62321128.tar.xz linux-dev-79fc170b1f5c36f486d886bfbd59eb4e62321128.zip |
Merge branch 'akpm'
Fixes from Andrew:
* akpm:
fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters()
mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2
mm/mmap.c: don't clobber partially overlapping VMA with MAP_FIXED_NOREPLACE
ocfs2: fix a GCC warning
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions