| commit | 63cf207e931894b93fe5471131e41fda567611e2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 11 10:13:49 2016 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 11 10:13:49 2016 -0800 |
| tree | b27920e481e6cbb6d3c310ca385368d3dccdec1e | |
| parent | f2c1242194c7af9b26f53359ab2b23df36d3a643 [diff] | |
| parent | f93812846f31381d35c04c6c577d724254355e7f [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs fixes from Al Viro: "A couple of fixes: Fix for my dumb braino in ncpfs and a long-standing breakage on recovery from failed rename() in jffs2" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: jffs2: reduce the breakage on recovery from halfway failed rename() ncpfs: fix a braino in OOM handling in ncp_fill_cache()