This repository has been archived by the owner on Jul 7, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag '5.4-rc1-4.14' of https://kernel.googlesource.com/pub/scm/l…
…inux/kernel/git/jaegeuk/f2fs-stable into neutrino-msm-hotdogb-4.14 Release 5.4-rc1-4.14 HEAD: d9b27dd ("f2fs: add a condition to detect overflow in f2fs_ioc_gc_range()") Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com> Conflicts: fs/crypto/Makefile fs/crypto/bio.c fs/crypto/crypto.c fs/crypto/fscrypt_private.h fs/crypto/keyinfo.c fs/ext4/inode.c fs/ext4/ioctl.c fs/ext4/page-io.c fs/ext4/readpage.c fs/f2fs/data.c fs/f2fs/inode.c include/linux/fscrypt.h include/uapi/linux/fs.h
- Loading branch information
Showing
69 changed files
with
12,529 additions
and
1,499 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.