Changes in Kconfig

0fc8f6200d2313278fbf4539bbab74677c685531 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 27 Apr 2026 10:26:49 +0200

Merge drm/drm-fixes into drm-misc-fixesGetting fixes and updates from v7.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/fs/crypto/Kconfig

9932f00bf40d281151de5694bc0f097cb9b5616c - Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux

Tue, 14 Apr 2026 02:29:12 +0200

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linuxPull fscrypt updates from Eric Biggers: - Various cleanups for the interface between fs/crypto/ and filesystems, from Christoph Hellwig - Simplify and optimize the implementation of v1 key derivation by using the AES library instead of the crypto_skcipher API* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux: fscrypt: use AES library for v1 key derivation ext4: use a byte granularity cursor in ext4_mpage_readpages fscrypt: pass a real sector_t to fscrypt_zeroout_range fscrypt: pass a byte length to fscrypt_zeroout_range fscrypt: pass a byte offset to fscrypt_zeroout_range fscrypt: pass a byte length to fscrypt_zeroout_range_inline_crypt fscrypt: pass a byte offset to fscrypt_zeroout_range_inline_crypt fscrypt: pass a byte offset to fscrypt_set_bio_crypt_ctx fscrypt: pass a byte offset to fscrypt_mergeable_bio fscrypt: pass a byte offset to fscrypt_generate_dun fscrypt: move fscrypt_set_bio_crypt_ctx_bh to buffer.c ext4, fscrypt: merge fscrypt_mergeable_bio_bh into io_submit_need_new_bio ext4: factor out a io_submit_need_new_bio helper ext4: open code fscrypt_set_bio_crypt_ctx_bh ext4: initialize the write hint in io_submit_init_bio List of files: /linux/fs/crypto/Kconfig

1546d3feb5e533fbee6710bd51b2847b2ec23623 - fscrypt: use AES library for v1 key derivation

Sat, 21 Mar 2026 08:53:38 +0100

fscrypt: use AES library for v1 key derivationConvert the implementation of the v1 (original / deprecated) fscryptper-file key derivation algorithm to use the AES library instead of an"ecb(aes)" crypto_skcipher. This is much simpler.While the AES library doesn't support AES-ECB directly yet, we can stillsimply call aes_encrypt() in a loop. While that doesn't explicitlyparallelize the AES encryptions, it doesn't really matter in this case,where a new key is used each time and only 16 to 64 bytes are encrypted.In fact, a quick benchmark (AMD Ryzen 9 9950X) shows that this commitactually greatly improves performance, from ~7000 cycles per key derivedto ~1500. The times don't differ much between 32 bytes and 64 byteseither, so clearly the bottleneck is API stuff and key expansion.Granted, performance of the v1 key derivation is no longer veryrelevant: most users have moved onto v2 encryption policies. The v2 keyderivation uses HKDF-SHA512 (which is ~3500 cycles on the same CPU).Still, it's nice that the simpler solution is much faster as well.Compatibility verified with xfstests generic/548.Link: https://lore.kernel.org/r/20260321075338.99809-1-ebiggers@kernel.orgSigned-off-by: Eric Biggers List of files: /linux/fs/crypto/Kconfig

a4a508df2aa34f8650afde54ea804321c618f45f - Merge tag 'v6.18' into next

Sat, 13 Dec 2025 10:18:20 +0100

Merge tag 'v6.18' into nextSync up with the mainline to bring in the latest APIs. List of files: /linux/fs/crypto/Kconfig

cb9f145f638d7afa633632a9290d6ad06caeb8ee - Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark

Sat, 01 Nov 2025 13:47:30 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-next-robclarkBack-merge drm-next to get caught up.Signed-off-by: Rob Clark List of files: /linux/fs/crypto/Kconfig

82ee50252dc891e3f3b32d923bb4f656d300b772 - Merge drm/drm-next into drm-xe-next

Tue, 14 Oct 2025 11:31:49 +0200

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 6.18-rc1.Signed-off-by: Thomas Hellström List of files: /linux/fs/crypto/Kconfig

2acee98fcc61052d63fab4539fcb6ee677555645 - Merge drm/drm-next into drm-intel-next

Tue, 14 Oct 2025 09:37:11 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.18-rc1.Signed-off-by: Jani Nikula List of files: /linux/fs/crypto/Kconfig

9b966ae42235a88eaea714be09ff3d698535bdfe - Merge drm/drm-next into drm-misc-next

Mon, 13 Oct 2025 09:19:19 +0200

Merge drm/drm-next into drm-misc-nextUpdating drm-misc-next to the state of v6.18-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/fs/crypto/Kconfig

2ace52718376fdb56aca863da2eebe70d7e2ddb1 - Merge branch 'objtool/core'

Fri, 21 Nov 2025 11:21:20 +0100

Merge branch 'objtool/core'Bring in the UDB and objtool data annotations to avoid conflicts while further extending the bug exceptions.Signed-off-by: Peter Zijlstra List of files: /linux/fs/crypto/Kconfig

f39b6c468c52745dbca9a842d91c8373fda208ab - Merge tag 'v6.18-rc6' into for-linus

Tue, 18 Nov 2025 08:16:55 +0100

Merge tag 'v6.18-rc6' into for-linusSync up with the mainline to bring in definition ofINPUT_PROP_HAPTIC_TOUCHPAD. List of files: /linux/fs/crypto/Kconfig

4f38da1f027ea2c9f01bb71daa7a299c191b6940 - spi: Merge up v6.18-rc1

Mon, 13 Oct 2025 14:32:13 +0200

spi: Merge up v6.18-rc1Ensure my CI has a sensible baseline. List of files: /linux/fs/crypto/Kconfig

ec2e0fb07d789976c601bec19ecced7a501c3705 - Merge tag 'asoc-fix-v6.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Thu, 16 Oct 2025 20:14:24 +0200

Merge tag 'asoc-fix-v6.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.18A moderately large collection of driver specific fixes, plus a few newquirks and device IDs. The NAU8821 changes are a little large but morein mechanical ways than in ways that are complex. List of files: /linux/fs/crypto/Kconfig

48a710760e10a4f36e11233a21860796ba204b1e - Merge drm/drm-fixes into drm-misc-fixes

Tue, 14 Oct 2025 10:59:58 +0200

Merge drm/drm-fixes into drm-misc-fixesUpdating drm-misc-fixes to the state of v6.18-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/fs/crypto/Kconfig

d60ac92c105fd8c09224b92c3e34dd03327ba3f4 - Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux

Tue, 30 Sep 2025 00:33:50 +0200

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linuxPull fscrypt updates from Eric Biggers: "Make fs/crypto/ use the HMAC-SHA512 library functions instead of crypto_shash. This is simpler, faster, and more reliable"* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux: fscrypt: use HMAC-SHA512 library for HKDF fscrypt: Remove redundant __GFP_NOWARN List of files: /linux/fs/crypto/Kconfig

19591f7e781fd1e68228f5b3bee60be6425af886 - fscrypt: use HMAC-SHA512 library for HKDF

Sat, 06 Sep 2025 05:59:13 +0200

fscrypt: use HMAC-SHA512 library for HKDFFor the HKDF-SHA512 key derivation needed by fscrypt, just use theHMAC-SHA512 library functions directly. These functions were introducedin v6.17, and they provide simple and efficient direct support forHMAC-SHA512. This ends up being quite a bit simpler and more efficientthan using crypto/hkdf.c, as it avoids the generic crypto layer:- The HMAC library can't fail, so callers don't need to handle errors- No inefficient indirect calls- No inefficient and error-prone dynamic allocations- No inefficient and error-prone loading of algorithm by name- Less stack usageBenchmarks on x86_64 show that deriving a per-file key gets about 30%faster, and FS_IOC_ADD_ENCRYPTION_KEY gets nearly twice as fast.The only small downside is the HKDF-Expand logic gets duplicated again.Then again, even considering that, the new fscrypt_hkdf_expand() is only7 lines longer than the version that called hkdf_expand(). Later wecould add HKDF support to lib/crypto/, but for now let's just do this.Link: https://lore.kernel.org/r/20250906035913.1141532-1-ebiggers@kernel.orgSigned-off-by: Eric Biggers List of files: /linux/fs/crypto/Kconfig

bbfd5594756011167b8f8de9a00e0c946afda1e6 - Merge drm/drm-next into drm-intel-gt-next

Wed, 28 May 2025 09:20:17 +0200

Merge drm/drm-next into drm-intel-gt-nextNeed to pull in a67221b5eb8d ("drm/i915/dp: Return min bpc supported by source instead of 0")in order to fix build breakage on GCC 9.4.0 (from Ubuntu 20.04).Signed-off-by: Joonas Lahtinen List of files: /linux/fs/crypto/Kconfig

db5302ae571beec635c1a96e7f72926a4e65195e - Merge drm/drm-next into drm-intel-next

Fri, 16 May 2025 09:22:36 +0200

Merge drm/drm-next into drm-intel-nextBackmerge to sync with v6.15-rc, xe, and specifically async flip changesin drm-misc.Signed-off-by: Jani Nikula List of files: /linux/fs/crypto/Kconfig

4f9786035f9e519db41375818e1d0b5f20da2f10 - Merge branch 'next' into for-linus

Mon, 02 Jun 2025 06:41:07 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.16 merge window. List of files: /linux/fs/crypto/Kconfig

d51b9d81f7883f526b26e3ab903e646274aebeb1 - Merge tag 'v6.15-rc6' into next

Fri, 16 May 2025 01:20:39 +0200

Merge tag 'v6.15-rc6' into nextSync up with mainline to bring in xpad controller changes. List of files: /linux/fs/crypto/Kconfig

844e31bbaef7c8a6ff2c0fbac45c0c85b5484482 - Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next

Tue, 29 Apr 2025 22:42:29 +0200

Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-nextMerge drm-misc-next to get commit Fixes: fec450ca15af ("drm/display:hdmi: provide central data authority for ACR params").Signed-off-by: Rob Clark List of files: /linux/fs/crypto/Kconfig