From: James Morris <james.l.morris@oracle.com>
Date: Sat, 15 Aug 2015 03:29:57 +0000 (+1000)
Subject: Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
X-Git-Tag: submit/tizen/20160607.132125~1804^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e5f206c00f73f535c914eedc8b91f424c5a14ab;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
---

3e5f206c00f73f535c914eedc8b91f424c5a14ab
diff --cc security/selinux/include/avc.h
index 5973c32,db12ff1..0999df0
--- a/security/selinux/include/avc.h
+++ b/security/selinux/include/avc.h
@@@ -151,11 -151,11 +152,15 @@@ int avc_has_perm_noaudit(u32 ssid, u32 
  int avc_has_perm(u32 ssid, u32 tsid,
  		 u16 tclass, u32 requested,
  		 struct common_audit_data *auditdata);
 +int avc_has_perm_flags(u32 ssid, u32 tsid,
 +		       u16 tclass, u32 requested,
 +		       struct common_audit_data *auditdata,
 +		       int flags);
  
+ int avc_has_extended_perms(u32 ssid, u32 tsid, u16 tclass, u32 requested,
+ 		u8 driver, u8 perm, struct common_audit_data *ad);
+ 
+ 
  u32 avc_policy_seqno(void);
  
  #define AVC_CALLBACK_GRANT		1