]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2c1242 f938128)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Mar 2016 18:13:49 +0000 (10:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Mar 2016 18:13:49 +0000 (10:13 -0800)
commit63cf207e931894b93fe5471131e41fda567611e2
treeb27920e481e6cbb6d3c310ca385368d3dccdec1etree
parentf2c1242194c7af9b26f53359ab2b23df36d3a643commit | diff
parentf93812846f31381d35c04c6c577d724254355e7fcommit | 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()
Ubuntu combined Linux kernel mirror