c692cb96096def8727ae342ea0926c651f2eeed7 - kernel/msm-4.9 - Gitiles

commit	c692cb96096def8727ae342ea0926c651f2eeed7	[log] [tgz]
author	Neeraj Soni <neersoni@codeaurora.org>	Wed Apr 18 17:20:22 2018 +0530
committer	Veerabhadrarao Badiganti <vbadigan@codeaurora.org>	Tue May 22 12:58:05 2018 +0530
tree	1c661acf0e2e92c8e1670e1d662da44c4aedbf6f
parent	897e986e713858c7c8ce46167df49f06989059c6 [diff]

Resolve merge conflict and enable HW FBE for ext4 fs

HW File Based Encryption (FBE) uses Crypto Engine to
encrypt the user data with unique key for each file.
File name and data both are encrypted with this feature.
 - security/pfk: New module to support per file
   encryption using CE.
 - fs/ext4: changes made to support using crypto engine
   to encyrpt the data.
Other changes made to provide support framework for per
file encryption.

Change-Id: I82b05a73b10ad8c26b0e400cdf246c67a8060f0e
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>

block/bio.c[diff]
block/blk-merge.c[diff]
drivers/crypto/msm/ice.c[diff]
drivers/scsi/ufs/ufs-qcom-ice.c[diff]
drivers/scsi/ufs/ufs-qcom.h[diff]
fs/crypto/Makefile[diff]
fs/crypto/bio.c[diff]
fs/crypto/fscrypt_private.h[diff]
fs/crypto/keyinfo.c[diff]
fs/direct-io.c[diff]
fs/ext4/Kconfig[diff]
fs/ext4/Makefile[diff]
fs/ext4/ext4_ice.c[Added - diff]
fs/ext4/ext4_ice.h[Added - diff]
fs/ext4/inode.c[diff]
fs/ext4/ioctl.c[diff]
fs/ext4/page-io.c[diff]
fs/namei.c[diff]
include/linux/blk_types.h[diff]
include/linux/fs.h[diff]
include/linux/fscrypt_supp.h[diff]
include/linux/lsm_hooks.h[diff]
include/linux/pfk.h[Added - diff]
include/linux/security.h[diff]
include/uapi/linux/fs.h[diff]
security/Kconfig[diff]
security/Makefile[diff]
security/pfe/Kconfig[Added - diff]
security/pfe/Makefile[Added - diff]
security/pfe/pfk.c[Added - diff]
security/pfe/pfk_ext4.c[Added - diff]
security/pfe/pfk_ext4.h[Added - diff]
security/pfe/pfk_ice.c[Added - diff]
security/pfe/pfk_ice.h[Added - diff]
security/pfe/pfk_internal.h[Added - diff]
security/pfe/pfk_kc.c[Added - diff]
security/pfe/pfk_kc.h[Added - diff]
security/security.c[diff]
security/selinux/include/objsec.h[diff]
security/selinux/include/security.h[diff]

40 files changed