Linus Torvalds 3462ac5703 Refactor support for encrypted symlinks to move common code to fscrypt. ... -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEK2m5VNv+CHkogTfJ8vlZVpUNgaMFAlp2R3AACgkQ8vlZVpUN gaOIdAgApEdlFR2Gf93z2hMj5HxVL5rjkuPJVtVkKu0eH2HMQJyxNmjymrRfuFmM 8W1CrEvVKi5Aj6r8q4KHIdVV247Ya0SVEhLwKM0LX4CvlZUXmwgCmZ/MPDTXA1eq C4vPVuJAuSNGNVYDlDs3+NiMHINGNVnBVQQFSPBP9P+iNWPD7o486712qaF8maVn RbfbQ2rWtOIRdlAOD1U5WqgQku59lOsmHk2pc0+X4LHCZFpMoaO80JVjENPAw+BF daRt6TX+WljMyx6DRIaszqau876CJhe/tqlZcCLOkpXZP0jJS13yodp26dVQmjCh w8YdiY7uHK2D+S/8eyj7h7DIwzu3vg== =ZjQP -----END PGP SIGNATURE----- Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt Pull fscrypt updates from Ted Ts'o: "Refactor support for encrypted symlinks to move common code to fscrypt" Ted also points out about the merge: "This makes the f2fs symlink code use the fscrypt_encrypt_symlink() from the fscrypt tree. This will end up dropping the kzalloc() -> f2fs_kzalloc() change, which means the fscrypt-specific allocation won't get tested by f2fs's kmalloc error injection system; which is fine" * tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt: (26 commits) fscrypt: fix build with pre-4.6 gcc versions fscrypt: remove 'ci' parameter from fscrypt_put_encryption_info() fscrypt: document symlink length restriction fscrypt: fix up fscrypt_fname_encrypted_size() for internal use fscrypt: define fscrypt_fname_alloc_buffer() to be for presented names fscrypt: calculate NUL-padding length in one place only fscrypt: move fscrypt_symlink_data to fscrypt_private.h fscrypt: remove fscrypt_fname_usr_to_disk() ubifs: switch to fscrypt_get_symlink() ubifs: switch to fscrypt ->symlink() helper functions ubifs: free the encrypted symlink target f2fs: switch to fscrypt_get_symlink() f2fs: switch to fscrypt ->symlink() helper functions ext4: switch to fscrypt_get_symlink() ext4: switch to fscrypt ->symlink() helper functions fscrypt: new helper function - fscrypt_get_symlink() fscrypt: new helper functions for ->symlink() fscrypt: trim down fscrypt.h includes fscrypt: move fscrypt_is_dot_dotdot() to fs/crypto/fname.c fscrypt: move fscrypt_valid_enc_modes() to fscrypt_private.h ...		2018-02-04 10:43:12 -08:00
..
acpi	Merge branches 'acpi-gpio', 'acpi-button', 'acpi-battery' and 'acpi-video'	2018-01-18 03:02:16 +01:00
asm-generic	The core framework has a handful of patches this time around, mostly due	2018-02-01 16:56:07 -08:00
clocksource
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-01-31 14:22:45 -08:00
drm	drm/graphics pull request for v4.16-rc1	2018-02-01 17:48:47 -08:00
dt-bindings	This is the bulk of pin control changes for the v4.16 kernel cycle:	2018-02-02 14:22:53 -08:00
keys
kvm	KVM: arm/arm64: timer: Don't set irq as forwarded if no usable GIC	2017-12-18 10:53:23 +01:00
linux	Refactor support for encrypted symlinks to move common code to fscrypt.	2018-02-04 10:43:12 -08:00
math-emu
media
memory
misc	powerpc updates for 4.16	2018-02-02 10:01:04 -08:00
net	Currently, hardened usercopy performs dynamic bounds checking on slab	2018-02-03 16:25:42 -08:00
pcmcia
ras
rdma	RDMA/restrack: Add general infrastructure to track RDMA resources	2018-01-29 20:21:39 -07:00
scsi	SCSI postmerge on 20180202	2018-02-03 13:07:56 -08:00
soc	ARM: SoC driver updates for 4.16	2018-02-01 16:35:31 -08:00
sound	Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2018-01-30 17:58:07 -08:00
target
trace	Char/Misc driver patches for 4.16-rc1	2018-02-01 10:31:17 -08:00
uapi	powerpc updates for 4.16	2018-02-02 10:01:04 -08:00
video	drm/imx: format modifier support	2018-01-05 11:33:24 +10:00
xen	xen: fixes for 4.15-rc5	2017-12-22 12:30:10 -08:00