diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-19 23:26:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-19 23:26:31 +0200 |
| commit | 6162e4b0bedeb3dac2ba0a5e1b1f56db107d97ec (patch) | |
| tree | b4ee364c3819f19acd8a63b06d455b11cd91b9ae /net/Makefile | |
| parent | hexdump: avoid warning in test function (diff) | |
| parent | ext4 crypto: enable encryption feature flag (diff) | |
| download | linux-6162e4b0bedeb3dac2ba0a5e1b1f56db107d97ec.tar.xz linux-6162e4b0bedeb3dac2ba0a5e1b1f56db107d97ec.zip | |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 updates from Ted Ts'o:
"A few bug fixes and add support for file-system level encryption in
ext4"
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (31 commits)
ext4 crypto: enable encryption feature flag
ext4 crypto: add symlink encryption
ext4 crypto: enable filename encryption
ext4 crypto: filename encryption modifications
ext4 crypto: partial update to namei.c for fname crypto
ext4 crypto: insert encrypted filenames into a leaf directory block
ext4 crypto: teach ext4_htree_store_dirent() to store decrypted filenames
ext4 crypto: filename encryption facilities
ext4 crypto: implement the ext4 decryption read path
ext4 crypto: implement the ext4 encryption write path
ext4 crypto: inherit encryption policies on inode and directory create
ext4 crypto: enforce context consistency
ext4 crypto: add encryption key management facilities
ext4 crypto: add ext4 encryption facilities
ext4 crypto: add encryption policy and password salt support
ext4 crypto: add encryption xattr support
ext4 crypto: export ext4_empty_dir()
ext4 crypto: add ext4 encryption Kconfig
ext4 crypto: reserve codepoints used by the ext4 encryption feature
ext4 crypto: add ext4_mpage_readpages()
...
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions