diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-04 23:37:25 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-04 23:37:25 -0500 |
| commit | 83b3d538db83fe37e24b46befa699a4ae8c496f2 (patch) | |
| tree | 71141d9e170e9f489db186c640ef2a3abf7f1c18 /security/integrity/integrity.h | |
| parent | 4257412db57900e43716d0b7ddd4f4a51e6ed2f4 (diff) | |
| parent | 89fbec5b97fbcf08db3a9cd93a340f21f95d38b8 (diff) | |
Merge tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Merge "ARM: imx: fixes for 3.18, 2nd round" from Shawn Guo:
"This is the second round of i.MX fixes for 3.18. The clk-vf610 fix is
relatively big, because it needs some adaption to the change made by
offending commit dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits
from clk-pllv3 driver). And it should have been sent to you for earlier
-rc inclusion, but unfortunately it got delayed for some time because
Stefan wasn't aware of my email address change."
The i.MX fixes for 3.18, 2nd round:
- Fix a regression on Vybrid platform which is caused by commit
dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3
driver), and results in a missing configuration on PLL clocks.
- Fix a regression with i.MX defconfig files where CONFIG_SPI option
gets lost accidentally.
* tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (460 commits)
ARM: imx: Fix the removal of CONFIG_SPI option
ARM: imx: clk-vf610: define PLL's clock tree
+ Linux 3.18-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'security/integrity/integrity.h')
| -rw-r--r-- | security/integrity/integrity.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index c0379d13dbe1..9d1c2ebfe12a 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h | |||
| @@ -61,6 +61,7 @@ enum evm_ima_xattr_type { | |||
| 61 | EVM_XATTR_HMAC, | 61 | EVM_XATTR_HMAC, |
| 62 | EVM_IMA_XATTR_DIGSIG, | 62 | EVM_IMA_XATTR_DIGSIG, |
| 63 | IMA_XATTR_DIGEST_NG, | 63 | IMA_XATTR_DIGEST_NG, |
| 64 | IMA_XATTR_LAST | ||
| 64 | }; | 65 | }; |
| 65 | 66 | ||
| 66 | struct evm_ima_xattr_data { | 67 | struct evm_ima_xattr_data { |