]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf33b6d02538c97f47826a42e0b74d2c911755571
treeb27920e481e6cbb6d3c310ca385368d3dccdec1e
parent1fb0bb4dd12e464f1e3d3e069f71fda31ab59e2a
parent1b6bf9b641e33a56081ea0c65eb5228c831b8d3d
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()