[git pull] a couple of fixes

[Al Viro]

	Fix for my dumb braino in ncpfs and a long-standing breakage on
recovery from failed rename() in jffs2.

The following changes since commit a528aca7f359f4b0b1d72ae406097e491a5ba9ea:

  use ->d_seq to get coherency between ->d_inode and ->d_flags (2016-02-29 12:16:43 -0500)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus

for you to fetch changes up to f93812846f31381d35c04c6c577d724254355e7f:

  jffs2: reduce the breakage on recovery from halfway failed rename() (2016-03-07 23:07:10 -0500)

----------------------------------------------------------------
Al Viro (2):
      ncpfs: fix a braino in OOM handling in ncp_fill_cache()
      jffs2: reduce the breakage on recovery from halfway failed rename()

 fs/jffs2/dir.c | 11 ++++++++---
 fs/ncpfs/dir.c |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)