diff options
author | James Morris <james.l.morris@oracle.com> | 2014-07-19 09:39:19 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-07-19 09:39:19 +0200 |
commit | 2ccf4661f315615d018686d91d030a94001d0cc6 (patch) | |
tree | f5374b5233ba5c43a4710bc8cbc5319091da044e /scripts | |
parent | ima: provide double buffering for hash calculation (diff) | |
parent | selinux: reduce the number of calls to synchronize_net() when flushing caches (diff) | |
download | linux-2ccf4661f315615d018686d91d030a94001d0cc6.tar.xz linux-2ccf4661f315615d018686d91d030a94001d0cc6.zip |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/selinux/genheaders/Makefile | 1 | ||||
-rw-r--r-- | scripts/selinux/mdp/Makefile | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/selinux/genheaders/Makefile b/scripts/selinux/genheaders/Makefile index 417b165008ee..1d1ac51359e3 100644 --- a/scripts/selinux/genheaders/Makefile +++ b/scripts/selinux/genheaders/Makefile @@ -2,4 +2,3 @@ hostprogs-y := genheaders HOST_EXTRACFLAGS += -Isecurity/selinux/include always := $(hostprogs-y) -clean-files := $(hostprogs-y) diff --git a/scripts/selinux/mdp/Makefile b/scripts/selinux/mdp/Makefile index eb365b333441..dba7eff69a00 100644 --- a/scripts/selinux/mdp/Makefile +++ b/scripts/selinux/mdp/Makefile @@ -2,4 +2,4 @@ hostprogs-y := mdp HOST_EXTRACFLAGS += -Isecurity/selinux/include always := $(hostprogs-y) -clean-files := $(hostprogs-y) policy.* file_contexts +clean-files := policy.* file_contexts |