Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

Pull fscrypt updates from Eric Biggers:
 "First: Ted, Jaegeuk, and I have decided to add me as a co-maintainer
  for fscrypt, and we're now using a shared git tree. So we've updated
  MAINTAINERS accordingly, and I'm doing the pull request this time.

  The actual changes for v5.1 are:

   - Remove the fs-specific kconfig options like CONFIG_EXT4_ENCRYPTION
     and make fscrypt support for all fscrypt-capable filesystems be
     controlled by CONFIG_FS_ENCRYPTION, similar to how CONFIG_QUOTA
     works.

   - Improve error code for rename() and link() into encrypted
     directories.

   - Various cleanups"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  MAINTAINERS: add Eric Biggers as an fscrypt maintainer
  fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
  fscrypt: remove filesystem specific build config option
  f2fs: use IS_ENCRYPTED() to check encryption status
  ext4: use IS_ENCRYPTED() to check encryption status
  fscrypt: remove CRYPTO_CTR dependency

diff --cc MAINTAINERS
Simple merge

diff --cc fs/ext4/page-io.c
index cff4c4aa7a9c2d300c9ac2bc8f50c3981726d4d5,b9d6cabe2ea8e9ba6cfc0a846494f8c8404120ed..6f5305e9a6acccc62c025caed44f47ded8af9947
--- 1/fs/ext4/page-io.c
--- 2/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@@ -63,11 -63,10 +63,11 @@@ static void ext4_finish_bio(struct bio 
  {
        int i;
        struct bio_vec *bvec;
 +      struct bvec_iter_all iter_all;
  
 -      bio_for_each_segment_all(bvec, bio, i) {
 +      bio_for_each_segment_all(bvec, bio, i, iter_all) {
                struct page *page = bvec->bv_page;
- #ifdef CONFIG_EXT4_FS_ENCRYPTION
+ #ifdef CONFIG_FS_ENCRYPTION
                struct page *data_page = NULL;
  #endif
                struct buffer_head *bh, *head;

diff --cc fs/ext4/readpage.c
Simple merge

diff --cc fs/f2fs/data.c
Simple merge

diff --cc fs/f2fs/f2fs.h
Simple merge

diff --cc fs/f2fs/super.c
Simple merge

diff --cc include/linux/fs.h
Simple merge