Merge branch 'linux-4.9.y' of...

Merge branch 'linux-4.9.y' of https://kernel.googlesource.com/pub/scm/linux/kernel/git/jaegeuk/f2fs-stable

 into lineage-20

Conflicts:
  - fs/crypto/bio.c
  - fs/ext4/page-io.c
  - fs/f2fs/data.c
  - fs/f2fs/file.c
  - fs/f2fs/segment.c
  - include/linux/fscrypt.h
  - mm/swapfile.c

Change-Id: Ibea9796b3a86965708d82f9e915300b917529e93
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
Signed-off-by: kaderbava <ksbava7325@gmail.com>