Merge "pft: add allow_merge_bio() hook when PFT is LSM"

drivers/platform/msm/pft.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,8 @@ static struct security_operations pft_security_ops = {
		.file_open = pft_file_open,
		.file_permission = pft_file_permission,
		.file_close = pft_file_close,

		.allow_merge_bio = pft_allow_merge_bio,
		};

		static int __init pft_lsm_init(struct pft_device *dev)