Merge updates from Andrew Morton: - a few misc bits - ocfs2 - most(?) of MM * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (125 commits) thp: fix comments of __pmd_trans_huge_lock() cgroup: remove unnecessary 0 check from css_from_id() cgroup: fix idr leak for the first cgroup root mm: memcontrol: fix documentation for compound parameter mm: memcontrol: remove BUG_ON in uncharge_list mm: fix build warnings in <linux/compaction.h> mm, thp: convert from optimistic swapin collapsing to conservative mm, thp: fix comment inconsistency for swapin readahead functions thp: update Documentation/{vm/transhuge,filesystems/proc}.txt shmem: split huge pages beyond i_size under memory pressure thp: introduce CONFIG_TRANSPARENT_HUGE_PAGECACHE khugepaged: add support of collapse for tmpfs/shmem pages shmem: make shmem_inode_info::lock irq-safe khugepaged: move up_read(mmap_sem) out of khugepaged_alloc_page() thp: extract khugepaged from mm/huge_memory.c shmem, thp: respect MADV_{NO,}HUGEPAGE for file mappings shmem: add huge pages support shmem: get_unmapped_area align huge page shmem: prepare huge= mount option and sysfs knob mm, rmap: account shmem thp pages ...
Showing the changes to include/uapi (1 of 186 files). Show all
Unified · Split
| @@ -80,5 +80,7 @@ · 79 unmodified lines | ||
| 80 | 80 | #define BPF_FS_MAGIC 0xcafe4a11 |
| 81 | 81 | /* Since UDF 2.01 is ISO 13346 based... */ |
| 82 | 82 | #define UDF_SUPER_MAGIC 0x15013346 |
| 83 | +#define BALLOON_KVM_MAGIC 0x13661366 | |
| 84 | +#define ZSMALLOC_MAGIC 0x58295829 | |
| 83 | 85 | |
| 84 | 86 | #endif /* __LINUX_MAGIC_H__ */ |