diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-01-28 14:44:16 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-02-05 10:39:48 -0500 |
| commit | 825e587af2e90e9b953849f3347a01d8f383d577 (patch) | |
| tree | e48942a05882da47544e179c6a0c920e00137a6a /security/keys/Makefile | |
| parent | 8ed814602876bec9bad2649ca17f34b499357a1c (diff) | |
| parent | d8ec26d7f8287f5788a494f56e8814210f0e64be (diff) | |
Merge tag 'v3.13' into stable-3.14
Linux 3.13
Conflicts:
security/selinux/hooks.c
Trivial merge issue in selinux_inet_conn_request() likely due to me
including patches that I sent to the stable folks in my next tree
resulting in the patch hitting twice (I think). Thankfully it was an
easy fix this time, but regardless, lesson learned, I will not do that
again.
Diffstat (limited to 'security/keys/Makefile')
| -rw-r--r-- | security/keys/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile index 504aaa008388..dfb3a7bededf 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile | |||
| @@ -18,9 +18,11 @@ obj-y := \ | |||
| 18 | obj-$(CONFIG_KEYS_COMPAT) += compat.o | 18 | obj-$(CONFIG_KEYS_COMPAT) += compat.o |
| 19 | obj-$(CONFIG_PROC_FS) += proc.o | 19 | obj-$(CONFIG_PROC_FS) += proc.o |
| 20 | obj-$(CONFIG_SYSCTL) += sysctl.o | 20 | obj-$(CONFIG_SYSCTL) += sysctl.o |
| 21 | obj-$(CONFIG_PERSISTENT_KEYRINGS) += persistent.o | ||
| 21 | 22 | ||
| 22 | # | 23 | # |
| 23 | # Key types | 24 | # Key types |
| 24 | # | 25 | # |
| 26 | obj-$(CONFIG_BIG_KEYS) += big_key.o | ||
| 25 | obj-$(CONFIG_TRUSTED_KEYS) += trusted.o | 27 | obj-$(CONFIG_TRUSTED_KEYS) += trusted.o |
| 26 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/ | 28 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/ |