diff options
| author | Linus Torvalds | 2016-06-05 20:02:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-06-05 20:02:00 +0200 |
| commit | d834502e2fca9380a1579fecd134ef94c063b662 (patch) | |
| tree | 5f180e522792facbe222c3c28b69df8003c93304 /fs/btrfs/raid56.c | |
| parent | devpts: Make each mount of devpts an independent filesystem. (diff) | |
| parent | KEYS: Add placeholder for KDF usage with DH (diff) | |
| download | kernel-qcow2-linux-d834502e2fca9380a1579fecd134ef94c063b662.tar.gz kernel-qcow2-linux-d834502e2fca9380a1579fecd134ef94c063b662.tar.xz kernel-qcow2-linux-d834502e2fca9380a1579fecd134ef94c063b662.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull key handling update from James Morris:
"This alters a new keyctl function added in the current merge window to
allow for a future extension planned for the next merge window"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: Add placeholder for KDF usage with DH
Diffstat (limited to 'fs/btrfs/raid56.c')
0 files changed, 0 insertions, 0 deletions