diff --git a/fs-aufs.patch b/fs-aufs.patch index ab35f94..da82948 100644 --- a/fs-aufs.patch +++ b/fs-aufs.patch @@ -1,3 +1,6 @@ +From: aufs <> +Subject: aufs + diff --git a/Documentation/ABI/testing/debugfs-aufs b/Documentation/ABI/testing/debugfs-aufs new file mode 100644 index 000000000000..4a6694194ba6 diff --git a/kernel-i586.config b/kernel-i586.config index 0724468..c83d160 100644 --- a/kernel-i586.config +++ b/kernel-i586.config @@ -2943,6 +2943,8 @@ CONFIG_IMA_NG_TEMPLATE=y CONFIG_IMA_READ_POLICY=y # CONFIG_IMA_SIG_TEMPLATE is not set # CONFIG_IMA_TEMPLATE is not set +# deprecteated -> INTEGRITY_TRUSTED_KEYRING +CONFIG_IMA_TRUSTED_KEYRING=n CONFIG_IMA_WRITE_POLICY=n CONFIG_IMA=y CONFIG_IMG_ASCII_LCD=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index bcf7996..13ec1de 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2966,7 +2966,8 @@ CONFIG_IMA_NG_TEMPLATE=y CONFIG_IMA_READ_POLICY=y # CONFIG_IMA_SIG_TEMPLATE is not set # CONFIG_IMA_TEMPLATE is not set -CONFIG_IMA_TRUSTED_KEYRING=y +# deprecteated -> INTEGRITY_TRUSTED_KEYRING +CONFIG_IMA_TRUSTED_KEYRING=n CONFIG_IMA_WRITE_POLICY=n CONFIG_IMA=y CONFIG_IMG_ASCII_LCD=m