Changes in Makefile

67f8bc848ee31831336bd478e57d2f993551902e - Merge drm/drm-fixes into drm-misc-fixes

Tue, 01 Sep 2026 09:38:51 +0200

Merge drm/drm-fixes into drm-misc-fixesLet's start the 7.3 drm-misc-fixes cycle.Signed-off-by: Maxime Ripard List of files: /linux/fs/crypto/Makefile

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

Tue, 18 Aug 2026 04:04:16 +0200

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linuxPull fscrypt updates from Eric Biggers: "The main change this cycle is a significant simplification that's been overdue for a while now: standardizing on a single file contents encryption implementation in ext4 and f2fs, instead of having two. Specifically, the original filesystem-layer file contents encryption implementation is removed, and the blk-crypto implementation is now used unconditionally. blk-crypto delegates either to inline crypto hardware or to the CPU via blk-crypto-fallback. The latter is functionally equivalent to the original filesystem-layer code. The blk-crypto implementation already existed, but previously it was used only when the filesystem was mounted with "-o inlinecrypt". Now, "-o inlinecrypt" just selects whether inline crypto hardware is used. To allow maintaining that user control over hardware use, the blk-crypto API is extended with a new flag BLK_CRYPTO_CFG_ALLOW_HW. Overall, this removes quite a bit of redundant code from ext4, f2fs, and fs/crypto/. It should make things easier for ongoing filesystem efforts such as iomap support, large folios, and btrfs encryption (btrfs had already been planning to use blk-crypto exclusively.) There are two small behavior changes of note: - Direct I/O now works on encrypted files even without "-o inlinecrypt", rather than falling back to buffered I/O. This is effectively a bugfix, though I'll continue to keep an eye out for any user that may have been depending on the buffered I/O fallback. - IV_INO_LBLK_32 policies are no longer supported in certain cases that didn't make sense and have no known uses. This has been in linux-next since July 22 with no reported issues. All encryption xfstests pass on ext4 and f2fs. As usual I've also been using it on a system with an fscrypt-encrypted home directory. Of course, the blk-crypto code paths also aren't new and were already being used on many systems via the inlinecrypt mount option. In addition to the main change described above, there are a few other cleanups such as using lock guards for mutexes, improving documentation, and removing a workaround for outdated gcc versions"* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux: (29 commits) blk-crypto: Update docs for blk-crypto-fallback motivation blk-crypto: Remove unused function blk_crypto_config_supported() fscrypt: Update docs for data path fscrypt: Remove unused function fscrypt_finalize_bounce_page() f2fs: Update outdated comment in f2fs_write_begin() fs: Update outdated comment for SB_INLINECRYPT fscrypt: Update encryption policy version docs fscrypt: Replace some variable-size memsets with fixed-size fscrypt: Add safety checks to non-block-based en/decryption fscrypt: Merge bio.c and inline_crypt.c into block.c fscrypt: Remove unused functions and workqueue fscrypt: Remove fs-layer zeroout code fscrypt: Remove fscrypt_dio_supported() fscrypt: Replace calls to fscrypt_inode_uses_inline_crypto() fs/buffer: Remove fs-layer decryption code f2fs: Remove fs-layer file contents en/decryption code ext4: Further de-generalize the bio postprocessing code ext4: Make ext4_bio_write_folio() return void ext4: Remove fs-layer file contents en/decryption code Documentation: fscrypt: Update docs for inlinecrypt ... List of files: /linux/fs/crypto/Makefile

1944540c405083a966f898e9096c36888887a49e - fscrypt: Merge bio.c and inline_crypt.c into block.c

Mon, 13 Jul 2026 04:37:07 +0200

fscrypt: Merge bio.c and inline_crypt.c into block.cNow that fscrypt always uses blk-crypto on block-based filesystems,there's no meaningful difference between bio.c and inline_crypt.c.Therefore merge the two files into one named block.c.Note: I didn't carry over bio.c's "Copyright (C) 2015, MotorolaMobility", as none of the code that applied to remained.Reviewed-by: Christoph Hellwig Link: https://patch.msgid.link/20260713023708.9245-17-ebiggers@kernel.orgSigned-off-by: Eric Biggers List of files: /linux/fs/crypto/Makefile

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

Tue, 15 Dec 2020 01:27:23 +0100

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

05909cd9a0c8811731b38697af13075e8954314f - Merge tag 'v5.9' into next

Wed, 18 Nov 2020 03:13:23 +0100

Merge tag 'v5.9' into nextSync up with mainline to bring in the latest DTS files. List of files: /linux/fs/crypto/Makefile

0ea8a56de21be24cb79abb03dee79aabcd60a316 - Merge drm/drm-next into drm-intel-next-queued

Sat, 12 Sep 2020 02:00:20 +0200

Merge drm/drm-next into drm-intel-next-queuedSync drm-intel-gt-next here so we can have an unified fixes flow.Signed-off-by: Rodrigo Vivi List of files: /linux/fs/crypto/Makefile

9ddb236f13594b34a12dacf69a5adca7a1aef35e - Merge branch 'for-linus' into for-next

Wed, 09 Sep 2020 18:26:07 +0200

Merge branch 'for-linus' into for-nextBack-merge to apply the tasklet conversion patches that are basedon the already applied tasklet API changes on 5.9-rc4.Signed-off-by: Takashi Iwai List of files: /linux/fs/crypto/Makefile

6bde8ef51c917a657476310728d6cb3de6bac9e4 - Merge branch 'topic/tasklet-convert' into for-linus

Wed, 02 Sep 2020 13:31:45 +0200

Merge branch 'topic/tasklet-convert' into for-linusPull tasklet API conversions.Signed-off-by: Takashi Iwai List of files: /linux/fs/crypto/Makefile

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/fs/crypto/Makefile

3bec5b6aae830355e786e204b20a7cea38c3a8ed - Merge tag 'v5.9-rc2' into regulator-5.9

Tue, 25 Aug 2020 12:01:46 +0200

Merge tag 'v5.9-rc2' into regulator-5.9Linux 5.9-rc2 List of files: /linux/fs/crypto/Makefile

1959ba4e40ce40c380dbe868433f5c4b20bb1ba3 - Merge tag 'v5.9-rc2' into asoc-5.9

Tue, 25 Aug 2020 12:00:43 +0200

Merge tag 'v5.9-rc2' into asoc-5.9Linux 5.9-rc2 List of files: /linux/fs/crypto/Makefile

2d9ad4cfaf4d32a64a4ed556e5bcab9121215026 - Merge tag 'v5.9-rc2' into drm-misc-fixes

Tue, 25 Aug 2020 11:00:02 +0200

Merge tag 'v5.9-rc2' into drm-misc-fixesBackmerge requested by Tomi for a fix to omap inconsistentlocking state issue, and because we need at least v5.9-rc2 now.Signed-off-by: Maarten Lankhorst List of files: /linux/fs/crypto/Makefile

d85ddd1318e66c0c2665dbfcbc21a8b66c9152aa - Merge v5.9-rc1 into drm-misc-next

Tue, 18 Aug 2020 14:14:25 +0200

Merge v5.9-rc1 into drm-misc-nextSam needs 5.9-rc1 to have dev_err_probe in to merge some patches.Signed-off-by: Maxime Ripard List of files: /linux/fs/crypto/Makefile

94fb1afb14c4f0ceb8c5508ddddac6819f662e95 - Mgerge remote-tracking branch 'torvalds/master' into perf/core

Thu, 06 Aug 2020 13:15:47 +0200

Mgerge remote-tracking branch 'torvalds/master' into perf/coreTo sync headers, for instance, in this case tools/perf was ahead ofupstream till Linus merged tip/perf/core to get thePERF_RECORD_TEXT_POKE changes: Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h' differs from latest version at 'include/uapi/linux/perf_event.h' diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux/perf_event.hSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux/fs/crypto/Makefile

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

Mon, 03 Aug 2020 19:09:59 +0200

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscryptPull fscrypt updates from Eric Biggers: "This release, we add support for inline encryption via the blk-crypto framework which was added in 5.8. Now when an ext4 or f2fs filesystem is mounted with '-o inlinecrypt', the contents of encrypted files will be encrypted/decrypted via blk-crypto, instead of directly using the crypto API. This model allows taking advantage of the inline encryption hardware that is integrated into the UFS or eMMC host controllers on most mobile SoCs. Note that this is just an alternate implementation; the ciphertext written to disk stays the same. (This pull request does *not* include support for direct I/O on encrypted files, which blk-crypto makes possible, since that part is still being discussed.) Besides the above feature update, there are also a few fixes and cleanups, e.g. strengthening some memory barriers that may be too weak. All these patches have been in linux-next with no reported issues. I've also tested them with the fscrypt xfstests, as usual. It's also been tested that the inline encryption support works with the support for Qualcomm and Mediatek inline encryption hardware that will be in the scsi pull request for 5.9. Also, several SoC vendors are already using a previous, functionally equivalent version of these patches"* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: fscrypt: don't load ->i_crypt_info before it's known to be valid fscrypt: document inline encryption support fscrypt: use smp_load_acquire() for ->i_crypt_info fscrypt: use smp_load_acquire() for ->s_master_keys fscrypt: use smp_load_acquire() for fscrypt_prepared_key fscrypt: switch fscrypt_do_sha256() to use the SHA-256 library fscrypt: restrict IV_INO_LBLK_* to AES-256-XTS fscrypt: rename FS_KEY_DERIVATION_NONCE_SIZE fscrypt: add comments that describe the HKDF info strings ext4: add inline encryption support f2fs: add inline encryption support fscrypt: add inline encryption support fs: introduce SB_INLINECRYPT List of files: /linux/fs/crypto/Makefile

5fee36095cda45d34555aed3a2e8973b80cd6bf8 - fscrypt: add inline encryption support

Thu, 02 Jul 2020 03:56:05 +0200

fscrypt: add inline encryption supportAdd support for inline encryption to fs/crypto/. With "inlineencryption", the block layer handles the decryption/encryption as partof the bio, instead of the filesystem doing the crypto itself viaLinux's crypto API. This model is needed in order to take advantage ofthe inline encryption hardware present on most modern mobile SoCs.To use inline encryption, the filesystem needs to be mounted with'-o inlinecrypt'. Blk-crypto will then be used instead of the traditionalfilesystem-layer crypto whenever possible to encrypt the contentsof any encrypted files in that filesystem. Fscrypt still provides the keyand IV to use, and the actual ciphertext on-disk is still the same;therefore it's testable using the existing fscrypt ciphertext verificationtests.Note that since blk-crypto has a fallback to Linux's crypto API, andalso supports all the encryption modes currently supported by fscrypt,this feature is usable and testable even without actual inlineencryption hardware.Per-filesystem changes will be needed to set encryption contexts whensubmitting bios and to implement the 'inlinecrypt' mount option. Thispatch just adds the common code.Signed-off-by: Satya Tangirala Reviewed-by: Jaegeuk Kim Reviewed-by: Eric Biggers Reviewed-by: Theodore Ts'o Link: https://lore.kernel.org/r/20200702015607.1215430-3-satyat@google.comCo-developed-by: Eric Biggers Signed-off-by: Eric Biggers List of files: /linux/fs/crypto/Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

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

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/fs/crypto/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/fs/crypto/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/fs/crypto/Makefile