summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2016-03-177-90/+65
|\
| * Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2016-03-042-63/+14
| |\
| | * X.509: Make algo identifiers text instead of enumDavid Howells2016-03-031-26/+4
| | * akcipher: Move the RSA DER encoding check to the crypto layerDavid Howells2016-03-031-2/+0
| | * crypto: public_key: remove MPIs from public_key_signature structTadeusz Struk2016-02-181-13/+1
| | * crypto: KEYS: convert public key and digsig asym to the akcipher apiTadeusz Struk2016-02-101-24/+10
| | * KEYS: Add an alloc flag to convey the builtinness of a keyDavid Howells2016-02-091-0/+1
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2016-02-264-26/+50
| |\ \
| | * | ima: load policy using pathDmitry Kasatkin2016-02-211-0/+1
| | * | kexec: replace call to copy_file_from_fd() with kernel versionMimi Zohar2016-02-211-0/+2
| | * | module: replace copy_module_from_fd with kernel versionMimi Zohar2016-02-214-18/+1
| | * | vfs: define kernel_copy_file_from_fd()Mimi Zohar2016-02-211-0/+2
| | * | security: define kernel_read_file hookMimi Zohar2016-02-213-0/+21
| | * | firmware: replace call to fw_read_file_contents() with kernel versionMimi Zohar2016-02-214-24/+1
| | * | vfs: define kernel_read_file_from_pathMimi Zohar2016-02-211-0/+2
| | * | ima: define a new hook to measure and appraise a file already in memoryMimi Zohar2016-02-202-0/+9
| | * | vfs: define kernel_read_file_id enumerationMimi Zohar2016-02-183-4/+14
| | * | vfs: define a generic function to read a file from the kernelMimi Zohar2016-02-183-0/+17
| | |/
| * / tpm: fix checks for policy digest existence in tpm2_seal_trusted()Jarkko Sakkinen2016-02-101-1/+1
| |/
* | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds2016-03-1719-504/+238
|\ \
| * | crypto: ccp - CCP versioning supportGary R Hook2016-03-111-0/+17
| * | crypto: doc - update AEAD AD handlingStephan Mueller2016-02-171-3/+3
| * | crypto: doc - add akcipher APIStephan Mueller2016-02-171-14/+14
| * | crypto: xts - consolidate sanity check for keysStephan Mueller2016-02-171-0/+27
| * | crypto: keys - Revert "convert public key to akcipher api"Herbert Xu2016-02-091-11/+37
| * | crypto: public_key - remove MPIs from public_key_signature structTadeusz Struk2016-02-061-13/+1
| * | crypto: asymmetric_keys - convert public key and digsig asym to the akcipher apiTadeusz Struk2016-02-061-24/+10
| * | crypto: aead - move aead_request_cast helper to aead.hTadeusz Struk2016-02-061-0/+6
| * | crypto: hash - Remove crypto_hash interfaceHerbert Xu2016-02-063-272/+0
| * | crypto: hash - Add helpers to return alg and driver namesHerbert Xu2016-02-061-0/+20
| * | crypto: skcipher - Fix driver name helperHerbert Xu2016-02-061-1/+1
| * | crypto: engine - Introduce the block request crypto engine frameworkBaolin Wang2016-02-011-0/+70
| * | crypto: api - Introduce crypto_queue_len() helper functionBaolin Wang2016-02-011-0/+4
| * | crypto: compress - remove unused pcomp interfaceJoonsoo Kim2016-01-273-174/+0
| * | tcp: Use ahashHerbert Xu2016-01-271-5/+1
| * | sctp: Use shashHerbert Xu2016-01-272-5/+5
| * | iscsi-target: Use shash and ahashHerbert Xu2016-01-271-2/+2
| * | iscsi_tcp: Use ahashHerbert Xu2016-01-271-6/+7
| * | sunrpc: Use skcipher and ahash/shashHerbert Xu2016-01-271-16/+16
| * | crypto: skcipher - Add helper to retrieve driver nameHerbert Xu2016-01-271-0/+6
| * | crypto: hash - Add crypto_has_ahash helperHerbert Xu2016-01-251-0/+12
| * | crypto: skcipher - Add helper to zero stack requestHerbert Xu2016-01-251-0/+7
| * | crypto: hash - Add helpers to zero stack request/descriptorHerbert Xu2016-01-251-0/+13
| * | crypto: drbg - remove FIPS 140-2 continuous testStephan Mueller2016-01-251-4/+0
| * | crypto: skcipher - Add default key size helperHerbert Xu2016-01-251-3/+8
* | | Merge tag 'fbdev-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/...Linus Torvalds2016-03-161-3/+0
|\ \ \
| * | | fbdev: kill fb_rotateRasmus Villemoes2016-02-261-3/+0
* | | | Merge tag 'media/v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mch...Linus Torvalds2016-03-1615-46/+548
|\ \ \ \
| * \ \ \ Merge commit '840f5b0572ea' into v4l_for_linusMauro Carvalho Chehab2016-03-1515-46/+548
| |\ \ \ \
| | * | | | [media] v4l2-mc.h: fix yet more compiler errorsHans Verkuil2016-03-041-4/+3