Linus Torvalds
33673dcb37
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ...
Pull security subsystem updates from James Morris:
"This is basically a maintenance update for the TPM driver and EVM/IMA"
Fix up conflicts in lib/digsig.c and security/integrity/ima/ima_main.c
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (45 commits)
tpm/ibmvtpm: build only when IBM pseries is configured
ima: digital signature verification using asymmetric keys
ima: rename hash calculation functions
ima: use new crypto_shash API instead of old crypto_hash
ima: add policy support for file system uuid
evm: add file system uuid to EVM hmac
tpm_tis: check pnp_acpi_device return code
char/tpm/tpm_i2c_stm_st33: drop temporary variable for return value
char/tpm/tpm_i2c_stm_st33: remove dead assignment in tpm_st33_i2c_probe
char/tpm/tpm_i2c_stm_st33: Remove __devexit attribute
char/tpm/tpm_i2c_stm_st33: Don't use memcpy for one byte assignment
tpm_i2c_stm_st33: removed unused variables/code
TPM: Wait for TPM_ACCESS tpmRegValidSts to go high at startup
tpm: Fix cancellation of TPM commands (interrupt mode)
tpm: Fix cancellation of TPM commands (polling mode)
tpm: Store TPM vendor ID
TPM: Work around buggy TPMs that block during continue self test
tpm_i2c_stm_st33: fix oops when i2c client is unavailable
char/tpm: Use struct dev_pm_ops for power management
TPM: STMicroelectronics ST33 I2C BUILD STUFF
...
2013-02-21 08:18:12 -08:00
2013-02-21 08:18:12 -08:00
2012-11-26 14:22:21 +01:00
2013-02-13 13:43:02 +01:00
2012-12-17 17:15:25 -08:00
2012-12-15 13:03:48 -08:00
2013-01-22 17:51:01 +00:00
2012-12-17 17:15:16 -08:00
2012-04-16 14:37:13 +02:00
2012-09-09 10:35:39 +02:00
2012-03-30 16:03:15 -07:00
2012-11-09 18:07:11 +05:30
2011-09-27 18:08:04 +02:00
2013-01-07 09:41:28 -08:00
2012-06-26 21:19:02 -07:00
2013-02-02 00:01:16 +01:00
2012-09-04 01:35:44 +02:00
2012-04-03 13:09:18 +02:00
2012-10-08 13:50:12 +10:30
2011-12-12 14:14:31 -08:00
2013-01-24 12:02:36 +11:00
2013-02-20 18:58:50 -08:00
2013-02-19 14:56:34 -05:00
2012-09-10 17:05:45 +02:00
2012-09-28 16:16:00 -03:00
2012-03-20 10:09:28 +00:00
2012-04-20 09:24:27 -07:00
2012-11-19 14:28:24 +01:00
2012-03-30 16:03:15 -07:00
2013-01-04 09:42:59 +09:00
2012-11-14 15:07:18 -08:00
2011-09-27 18:08:04 +02:00
2012-12-14 08:48:59 +01:00
2013-02-06 09:58:07 -08:00
2013-01-03 15:57:16 -08:00
2012-03-07 16:08:24 +01:00
2012-09-01 09:57:10 -07:00
2012-03-30 16:03:15 -07:00
2012-09-20 16:49:17 -04:00
2012-12-13 12:00:48 -08:00
2013-01-31 19:20:33 -05:00
2012-03-30 16:03:15 -07:00
2011-07-25 23:06:24 -07:00
2013-02-08 14:38:07 +00:00
2012-07-18 18:35:57 -07:00
2012-02-15 14:48:01 -08:00
2012-08-04 12:15:09 +04:00
2012-09-11 18:32:41 +08:00
2011-08-03 14:25:21 -10:00
2012-05-02 00:10:49 -07:00
2011-03-31 11:26:23 -03:00
2012-11-19 14:28:24 +01:00
2012-12-06 13:54:48 -05:00
2013-02-05 14:51:16 -05:00
2013-01-10 01:27:46 +01:00
2012-04-16 14:37:13 +02:00
2013-01-24 17:25:13 +01:00
2013-02-09 22:32:48 +01:00
2012-11-15 13:00:23 +11:00
2012-10-02 21:14:29 +10:00
2011-05-13 16:31:00 -07:00
2011-05-23 13:01:00 -07:00
2011-11-02 16:07:02 -07:00
2012-11-16 09:59:58 -08:00
2012-03-30 16:03:15 -07:00
2012-09-13 16:52:04 +02:00
2012-11-27 08:59:43 +04:00
2012-12-17 17:15:22 -08:00
2012-08-16 12:31:18 -07:00
2012-11-21 11:37:40 +01:00
2013-01-03 15:57:16 -08:00
2013-01-04 16:11:46 -08:00
2012-09-17 17:12:58 -07:00
2012-11-05 14:00:09 +08:00
2011-09-27 18:08:04 +02:00
2013-02-20 11:26:56 -08:00
2012-11-11 18:10:46 -08:00
2011-07-14 17:57:09 -07:00
2013-01-03 15:57:16 -08:00
2013-01-23 13:29:18 -05:00
2012-12-13 13:11:15 -08:00
2012-08-16 12:33:59 -07:00
2012-08-29 17:12:58 +02:00
2013-02-08 09:26:57 -08:00
2012-12-18 21:10:22 -08:00
2013-01-31 19:20:33 -05:00
2012-12-17 17:15:12 -08:00
2013-01-08 14:14:55 -08:00
2011-09-27 18:08:04 +02:00
2011-05-25 08:39:21 -07:00
2011-07-11 16:48:38 -07:00
2012-03-16 20:35:01 +00:00
2012-01-14 22:25:56 +01:00
2012-10-06 03:04:59 +09:00
2012-11-14 09:39:44 -08:00
2012-03-23 16:58:37 -07:00
2011-03-31 11:26:23 -03:00
2012-11-21 13:03:01 -08:00
2011-11-09 12:10:37 +02:00
2012-10-24 17:07:43 +02:00
2012-10-24 17:06:43 +02:00
2012-11-29 03:30:34 -08:00
2012-11-19 14:28:24 +01:00
2012-03-07 16:08:24 +01:00
2012-11-19 14:10:53 +01:00
2012-04-30 16:26:30 -04:00
2012-07-29 21:11:05 -03:00
2012-05-17 19:06:13 -04:00
2011-08-13 18:34:03 -07:00
2011-04-28 16:12:47 -04:00
2012-11-11 19:06:00 +01:00
2012-12-10 15:54:27 +01:00
2011-09-21 19:45:34 +03:00
2012-05-25 16:18:34 +02:00
2011-03-23 20:44:18 +01:00
2012-10-16 18:07:12 -07:00
2011-05-25 08:39:45 -07:00
2012-12-05 23:52:10 +00:00
2011-03-31 11:26:23 -03:00
2012-11-27 21:08:57 +01:00
2011-09-27 18:08:04 +02:00
2013-02-18 22:34:11 +01:00
2011-12-02 16:12:42 +00:00
2012-09-04 16:06:34 -07:00
2012-11-28 18:36:06 +10:00
2011-12-11 10:31:23 -08:00
2011-05-28 17:03:29 +02:00
2012-02-11 15:11:28 +01:00
2013-01-31 19:20:33 -05:00
2012-05-09 13:59:09 -07:00
2012-06-28 12:03:15 +02:00
2011-12-23 10:17:51 +11:00
2012-05-14 08:44:11 -03:00
2013-01-08 14:14:55 -08:00
2012-12-12 17:38:33 -08:00
2012-03-30 16:03:15 -07:00
2012-02-28 16:05:06 +01:00
2011-11-07 07:54:42 +10:30
2012-03-30 16:03:15 -07:00
2012-09-26 19:56:15 +02:00
2013-01-23 16:39:51 +01:00
2012-10-06 03:04:50 +09:00
2012-09-10 17:05:45 +02:00
2012-09-06 22:16:58 -07:00
2012-10-09 16:22:40 +09:00
2012-09-18 12:53:22 +03:00
2011-09-27 18:08:04 +02:00
2013-01-03 15:57:16 -08:00
2012-10-06 03:05:01 +09:00
2011-03-31 11:26:23 -03:00
2012-10-01 15:27:48 +02:00
2012-12-17 17:15:23 -08:00
2011-07-11 12:45:04 -07:00
2011-03-30 12:02:05 +02:00
2012-06-25 12:11:58 -07:00
2012-04-16 14:37:13 +02:00
2011-07-25 20:57:17 -07:00
2011-08-13 18:34:03 -07:00
2012-05-25 16:18:30 +02:00
2012-10-16 09:34:01 -07:00
2012-09-21 10:48:03 -06:00
2012-01-02 13:04:55 +01:00
2012-05-08 16:01:34 -07:00
2012-07-13 22:24:45 -07:00
33673dcb37
