diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-09-27 19:21:37 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-09-27 19:21:37 +1000 |
| commit | 1306d8e1c09fdc8ecb9ef235e2116352f810f9c5 (patch) | |
| tree | e1e3f871d1f346493f147f909c0f3b688df55735 /security/lsm_audit.c | |
| parent | 8a17ef9d8543744a0c6a6f5fdc65b5770e7eaa64 (diff) | |
| parent | 324152502b0ef2f65a3fe039b7dcd27b223d14ac (diff) | |
Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next
tpmdd reverts for Linux 4.9
Revert patches mistakenly included.
"Hi James,
I had a typo in my PR command:
git request-pull security/next git://git.infradead.org/users/jjs/linux-tpmdd.git master > tpmdd-next-20160915.txt
^^^^^^
That should have been the signed tag tpmdd-next-20160915. This caused
four commits slip into your tree that are not meant for 4.9 release. I
created a script to generate the signed tag + PR as a corrective
measure.
/Jarkko"
Diffstat (limited to 'security/lsm_audit.c')
0 files changed, 0 insertions, 0 deletions