summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
...
| * | | ext4 crypto: use per-inode tfm structureTheodore Ts'o2015-05-319-156/+96
| * | | ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabledTheodore Ts'o2015-05-311-0/+1
| * | | ext4 crypto: shrink size of the ext4_crypto_ctx structureTheodore Ts'o2015-05-314-34/+30
| * | | ext4 crypto: get rid of ci_mode from struct ext4_crypt_infoTheodore Ts'o2015-05-184-15/+12
| * | | ext4 crypto: use slab cachesTheodore Ts'o2015-05-183-34/+39
| * | | ext4: clean up superblock encryption mode fieldsTheodore Ts'o2015-05-184-32/+7
| * | | ext4 crypto: reorganize how we store keys in the inodeTheodore Ts'o2015-05-1811-346/+246
| * | | ext4 crypto: separate kernel and userspace structure for the keyTheodore Ts'o2015-05-186-48/+43
| * | | ext4 crypto: don't allocate a page when encrypting/decrypting file namesTheodore Ts'o2015-05-185-54/+28
| * | | ext4 crypto: optimize filename encryptionTheodore Ts'o2015-05-184-313/+230
* | | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-06-2421-177/+180
|\ \ \ \
| * | | | mm: do not ignore mapping_gfp_mask in page cache allocation pathsMichal Hocko2015-06-242-2/+3
| * | | | mm/hugetlb: reduce arch dependent code about hugetlb_prefault_arch_hookZhang Zhen2015-06-241-1/+0
| * | | | procfs: treat parked tasks as sleeping for task stateChris Metcalf2015-06-241-0/+8
| * | | | ocfs2: mark local functions as staticJoseph Qi2015-06-242-6/+6
| * | | | ocfs2: use swap() in ocfs2_double_lock()Fabian Frederick2015-06-241-9/+2
| * | | | ocfs2: use swap() in swap_refcount_rec()Fabian Frederick2015-06-241-4/+2
| * | | | ocfs2: use swap() in dx_leaf_sort_swap()Fabian Frederick2015-06-241-4/+1
| * | | | ocfs2: fix wrong check in ocfs2_direct_IO_get_blocksJoseph Qi2015-06-242-3/+15
| * | | | ocfs2: fix NULL pointer dereference in function ocfs2_abort_trigger()Xue jiufei2015-06-241-3/+1
| * | | | ocfs2: o2net: should remove debugfs in o2net_init() out branchalex chen2015-06-241-1/+1
| * | | | ocfs2: remove OCFS2_IOCB_SEM lock type in direct ioWeiWei Wang2015-06-243-37/+4
| * | | | ocfs2: do not BUG if jbd2_journal_dirty_metadata failsJoseph Qi2015-06-241-1/+14
| * | | | ocfs2: remove BUG_ON(!empty_extent) in __ocfs2_rotate_tree_left()Xue jiufei2015-06-241-1/+2
| * | | | ocfs2: return error when ocfs2_figure_merge_contig_type() failsXue jiufei2015-06-241-10/+24
| * | | | ocfs2/dlm: cleanup unused function __dlm_wait_on_lockres_flags_setJoseph Qi2015-06-241-1/+0
| * | | | ocfs2: use retval instead of status for checking errorDaeseok Youn2015-06-241-10/+10
| * | | | ocfs2: fix a tiny race when truncate dio orohaned entryJoseph Qi2015-06-244-46/+39
| * | | | ocfs2: remove __mlog_cpu_guessAndrew Morton2015-06-241-16/+3
| * | | | ocfs2: reduce object size of mlog usesJoe Perches2015-06-242-30/+59
| * | | | configfs: unexport/make static config_item_init()Fabian Frederick2015-06-241-2/+1
| * | | | NTFS: use kvfree() in ntfs_free()Pekka Enberg2015-06-241-6/+1
* | | | | Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2015-06-242-19/+39
|\ \ \ \ \
| * | | | | ramoops: make it possible to change mem_type param.Wang Long2015-05-211-1/+1
| * | | | | pstore/ram: verify ramoops header before saving recordBen Zhang2015-05-211-12/+28
| * | | | | fs/pstore: Optimization function ramoops_init_przslong.wanglong2015-05-211-5/+3
| * | | | | fs/pstore: update the backend parameter in pstore moduleWang Long2015-05-211-0/+6
| * | | | | pstore: do not use message compression without lockKonstantin Khlebnikov2015-05-211-1/+1
| | |/ / / | |/| | |
* | | | | Merge tag 'for-f2fs-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jae...Linus Torvalds2015-06-2429-616/+3775
|\ \ \ \ \
| * | | | | f2fs: do not trim preallocated blocks when truncating after i_sizeChao Yu2015-06-111-4/+4
| * | | | | f2fs crypto: add alloc_bounce_pageJaegeuk Kim2015-06-111-8/+15
| * | | | | f2fs crypto: fix to handle errors likewise ext4Jaegeuk Kim2015-06-111-3/+3
| * | | | | f2fs: drop the volatile_write flag onlyJaegeuk Kim2015-06-091-4/+2
| * | | | | f2fs: skip committing valid superblockChao Yu2015-06-083-5/+7
| * | | | | f2fs: setting discard option in parse_options()Chao Yu2015-06-081-11/+9
| * | | | | f2fs: fix to return exact trimmed sizeJaegeuk Kim2015-06-021-1/+1
| * | | | | f2fs: support FALLOC_FL_INSERT_RANGEChao Yu2015-06-021-2/+100
| * | | | | f2fs: hide common code in f2fs_replace_blockChao Yu2015-06-024-20/+23
| * | | | | f2fs: disable the discard option when device doesn't supportChenxi Mao2015-06-011-1/+3
| * | | | | f2fs crypto: remove alloc_page for bounce_pageJaegeuk Kim2015-06-012-23/+13