summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifsLinus Torvalds2015-06-258-209/+149
|\
| * UBI: Remove unnecessary `\'shengyong2015-06-032-2/+2
| * UBI: Use static class and attribute groupsTakashi Iwai2015-06-023-142/+57
| * UBI: add a helper function for updatting on-flash layout volumesshengyong2015-06-021-21/+24
| * UBI: Fastmap: Do not add vol if it already existsshengyong2015-06-021-1/+8
| * UBI: Init vol->reserved_pebs by assignmentshengyong2015-06-021-2/+2
| * UBI: Fastmap: Rename variables to make them meaningfulshengyong2015-06-021-29/+29
| * UBI: Fastmap: Remove unnecessary `\'shengyong2015-06-021-7/+7
| * UBI: Fastmap: Use max() to get the larger valueshengyong2015-06-021-2/+2
| * ubifs: fix to check error code of register_shrinkerChao Yu2015-06-021-1/+4
| * UBI: block: Dynamically allocate minor numbersDan Ehrenberg2015-06-021-2/+14
* | Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds2015-06-2529-1355/+1488
|\ \
| * | ext4: set lazytime on remount if MS_LAZYTIME is set by mountTheodore Ts'o2015-06-231-0/+3
| * | ext4: only call ext4_truncate when size <= isizeJosef Bacik2015-06-221-20/+18
| * | ext4: make online defrag error reporting consistentEric Whitney2015-06-221-3/+7
| * | ext4: minor cleanup of ext4_da_reserve_space()Eric Whitney2015-06-222-23/+9
| * | ext4: don't retry file block mapping on bigalloc fs with non-extent fileDarrick J. Wong2015-06-221-1/+1
| * | ext4: prevent ext4_quota_write() from failing due to ENOSPCTheodore Ts'o2015-06-215-7/+17
| * | ext4: call sync_blockdev() before invalidate_bdev() in put_super()Theodore Ts'o2015-06-211-0/+1
| * | jbd2: speedup jbd2_journal_dirty_metadata()Jan Kara2015-06-211-6/+27
| * | jbd2: get rid of open coded allocation retry loopMichal Hocko2015-06-152-14/+7
| * | ext4: improve warning directory handling messagesAndreas Dilger2015-06-153-69/+109
| * | jbd2: fix ocfs2 corrupt when updating journal superblock failsJoseph Qi2015-06-153-12/+35
| * | ext4: mballoc: avoid 20-argument function callRasmus Villemoes2015-06-151-6/+3
| * | ext4: wait for existing dio workers in ext4_alloc_file_blocks()Lukas Czerner2015-06-151-0/+6
| * | ext4: recalculate journal credits as inode depth changesLukas Czerner2015-06-151-0/+16
| * | jbd2: use GFP_NOFS in jbd2_cleanup_journal_tail()Dmitry Monakhov2015-06-151-1/+1
| * | ext4: use swap() in mext_page_double_lock()Fabian Frederick2015-06-131-6/+3
| * | ext4: use swap() in memswap()Fabian Frederick2015-06-131-4/+1
| * | ext4: fix race between truncate and __ext4_journalled_writepage()Theodore Ts'o2015-06-131-4/+19
| * | ext4 crypto: fail the mount if blocksize != pagesizeTheodore Ts'o2015-06-131-1/+9
| * | ext4: Add support FALLOC_FL_INSERT_RANGE for fallocateNamjae Jeon2015-06-093-52/+292
| * | jbd2: speedup jbd2_journal_get_[write|undo]_access()Jan Kara2015-06-082-5/+73
| * | jbd2: more simplifications in do_get_write_access()Jan Kara2015-06-081-71/+59
| * | jbd2: simplify error path on allocation failure in do_get_write_access()Jan Kara2015-06-081-2/+1
| * | jbd2: simplify code flow in do_get_write_access()Jan Kara2015-06-081-24/+25
| * | ext4 crypto: fix sparse warnings in fs/ext4/ioctl.cFabian Frederick2015-06-081-3/+3
| * | ext4: BUG_ON assertion repeated for inode1, not done for inode2David Moore2015-06-081-1/+1
| * | ext4 crypto: fix ext4_get_crypto_ctx()'s calling convention in ext4_decrypt_oneTheodore Ts'o2015-06-081-2/+2
| * | ext4: return error code from ext4_mb_good_group()Lukas Czerner2015-06-081-5/+20
| * | ext4: try to initialize all groups we can in case of failure on ppc64Lukas Czerner2015-06-081-3/+6
| * | ext4: verify block bitmap even after fresh initializationLukas Czerner2015-06-081-2/+2
| * | jbd2: revert must-not-fail allocation loops back to GFP_NOFAILMichal Hocko2015-06-082-23/+8
| * | ext4 crypto: allocate bounce pages using GFP_NOWAITTheodore Ts'o2015-06-032-23/+7
| * | ext4 crypto: release crypto resource on module exitChao Yu2015-05-311-0/+1
| * | ext4 crypto: handle unexpected lack of encryption keysTheodore Ts'o2015-05-313-9/+14
| * | ext4 crypto: allocate the right amount of memory for the on-disk symlinkTheodore Ts'o2015-05-313-21/+37
| * | ext4 crypto: clean up error handling in ext4_fname_setup_filenameTheodore Ts'o2015-05-311-19/+16
| * | ext4 crypto: policies may only be set on directoriesTheodore Ts'o2015-05-311-0/+2
| * | ext4 crypto: enforce crypto policy restrictions on cross-renamesTheodore Ts'o2015-05-311-0/+9