Alexey Polyudov 3ce0ad138f Merge remote-tracking branch 'partner/qcom-msm-4.9' into android-msm-bluecross-4.9 ...

Conflicts:
	drivers/gpu/drm/msm/dsi-staging/dsi_display.c
	drivers/soc/qcom/Makefile
	drivers/usb/phy/phy-msm-qusb-v2.c

Change-Id: I1cd8b5205cac72d247a266a51efa4d57ca976dc4

2017-12-20 16:16:25 -08:00

..

apparmor

Merge remote-tracking branch '4.9/tmp-ffc9972' into HEAD

2017-11-16 15:31:18 -08:00

integrity

ima: do not update security.ima if appraisal status is not INTEGRITY_PASS

2017-11-24 08:33:41 +01:00

keys

Merge remote-tracking branch 'partner/qcom-msm-4.9' into android-msm-bluecross-4.9

2017-12-20 16:16:25 -08:00

loadpin

security: mark LSM hooks as __ro_after_init

2017-07-25 15:01:41 -07:00

pfe

Revert "Enable HW File Based Encryption on ext4 file system"

2017-12-08 16:28:20 -08:00

selinux

Revert "Enable HW File Based Encryption on ext4 file system"

2017-12-08 16:28:20 -08:00

smack

Merge remote-tracking branch '4.9/tmp-05a906d' into msm-4.9

2017-10-19 12:05:22 -07:00

tomoyo

security: mark LSM hooks as __ro_after_init

2017-07-25 15:01:41 -07:00

yama

security: mark LSM hooks as __ro_after_init

2017-07-25 15:01:41 -07:00

commoncap.c

Merge remote-tracking branch '4.9/tmp-f7d2974' into msm-4.9

2017-09-19 12:07:46 -07:00

device_cgroup.c

security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition

2015-09-03 18:13:10 -07:00

inode.c

ANDROID: vfs: Add permission2 for filesystems with per mount permissions

2017-01-31 10:47:22 -08:00

Kconfig

Revert "Enable HW File Based Encryption on ext4 file system"

2017-12-08 16:28:20 -08:00

lsm_audit.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2016-10-04 14:48:27 -07:00

Makefile

Revert "Enable HW File Based Encryption on ext4 file system"

2017-12-08 16:28:20 -08:00

min_addr.c

…

security.c

f2fs/ext4/ice: catch up QC release

2017-12-11 09:40:03 -08:00