Changes in Makefile

f4b369c6fe0ceaba2da2daff8c9eb415f85926dd - Merge branch 'next' into for-linus

Mon, 20 Apr 2026 03:28:57 +0200

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

0421ccdfad0d92713a812a5aeb7d07b0ea7213c8 - Merge tag 'v7.0-rc3' into next

Thu, 12 Mar 2026 18:44:42 +0100

Merge tag 'v7.0-rc3' into nextSync up with the mainline to brig up the latest changes, specificallychanges to ALPS driver. List of files: /linux/fs/verity/Makefile

3e9e952bb3139ad1e08f3e1960239c2988ab90c9 - Merge branch 'for-7.1-printf-kunit-build' into for-linus

Mon, 20 Apr 2026 13:41:28 +0200

Merge branch 'for-7.1-printf-kunit-build' into for-linus List of files: /linux/fs/verity/Makefile

42d3b66d4cdbacfc9d120d2301b8de89cc29a914 - Merge drm/drm-next into drm-xe-next

Thu, 12 Mar 2026 15:17:56 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 7.00-rc3. Important ahead GPU SVM merging THPsupport.Signed-off-by: Matthew Brost List of files: /linux/fs/verity/Makefile

f09812b85fa6f41058bcc46e70ac406bf9b0493a - Merge drm/drm-next into drm-intel-next

Wed, 25 Feb 2026 12:23:04 +0100

Merge drm/drm-next into drm-intel-nextSync with v7.0-rc1 which contains a few treewide changes affecting i915.Signed-off-by: Jani Nikula List of files: /linux/fs/verity/Makefile

8b85987d3cf50178f67618122d9f3bb202f62f42 - Merge drm/drm-next into drm-misc-next

Mon, 23 Feb 2026 11:48:20 +0100

Merge drm/drm-next into drm-misc-nextLet's merge 7.0-rc1 to start the new drm-misc-next windowSigned-off-by: Maxime Ripard List of files: /linux/fs/verity/Makefile

c17ee635fd3a482b2ad2bf5e269755c2eae5f25e - Merge drm/drm-fixes into drm-misc-fixes

Mon, 23 Feb 2026 10:09:45 +0100

Merge drm/drm-fixes into drm-misc-fixes7.0-rc1 was just released, let's merge it to kick the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/fs/verity/Makefile

997f9640c9238b991b6c8abf5420b37bbba5d867 - Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux

Thu, 12 Feb 2026 19:41:34 +0100

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linuxPull fsverity updates from Eric Biggers: "fsverity cleanups, speedup, and memory usage optimization from Christoph Hellwig: - Move some logic into common code - Fix btrfs to reject truncates of fsverity files - Improve the readahead implementation - Store each inode's fsverity_info in a hash table instead of using a pointer in the filesystem-specific part of the inode. This optimizes for memory usage in the usual case where most files don't have fsverity enabled. - Look up the fsverity_info fewer times during verification, to amortize the hash table overhead"* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux: fsverity: remove inode from fsverity_verification_ctx fsverity: use a hashtable to find the fsverity_info btrfs: consolidate fsverity_info lookup f2fs: consolidate fsverity_info lookup ext4: consolidate fsverity_info lookup fs: consolidate fsverity_info lookup in buffer.c fsverity: push out fsverity_info lookup fsverity: deconstify the inode pointer in struct fsverity_info fsverity: kick off hash readahead at data I/O submission time ext4: move ->read_folio and ->readahead to readpage.c readahead: push invalidate_lock out of page_cache_ra_unbounded fsverity: don't issue readahead for non-ENOENT errors from __filemap_get_folio fsverity: start consolidating pagecache code fsverity: pass struct file to ->write_merkle_tree_block f2fs: don't build the fsverity work handler for !CONFIG_FS_VERITY ext4: don't build the fsverity work handler for !CONFIG_FS_VERITY fs,fsverity: clear out fsverity_info from common code fs,fsverity: reject size changes on fsverity files in setattr_prepare List of files: /linux/fs/verity/Makefile

821ddd25fbe88ea60e9c35cfb76c2ddeb1ffae26 - fsverity: start consolidating pagecache code

Wed, 28 Jan 2026 16:26:18 +0100

fsverity: start consolidating pagecache codeext4 and f2fs are largely using the same code to read a page fullof Merkle tree blocks from the page cache, and the upcoming xfsfsverity support would add another copy.Move the ext4 code to fs/verity/ and use it in f2fs as well. For f2fsthis removes the previous f2fs-specific error injection, but otherwisethe behavior remains unchanged.Signed-off-by: Christoph Hellwig Reviewed-by: Andrey Albershteyn Reviewed-by: Jan Kara Reviewed-by: "Darrick J. Wong" Link: https://lore.kernel.org/r/20260128152630.627409-7-hch@lst.deSigned-off-by: Eric Biggers List of files: /linux/fs/verity/Makefile

d0034a7a4ac7fae708146ac0059b9c47a1543f0d - Merge branch 'next' into for-linus

Tue, 04 May 2021 20:46:00 +0200

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

b7f8f259896f669f131713b0c74ba4d008daa71d - Merge tag 'v5.12-rc7' into ecryptfs/next

Mon, 19 Apr 2021 06:39:17 +0200

Merge tag 'v5.12-rc7' into ecryptfs/nextRequired to pick up idmapped mount changes which changed some functionparameters. List of files: /linux/fs/verity/Makefile

5acac83bf2e42f51ab9fd315d657798754bf0bb8 - Merge tag 'v5.12-rc4' into next

Thu, 25 Mar 2021 19:46:10 +0100

Merge tag 'v5.12-rc4' into nextSync up with the mainline to bring in newest APIs. List of files: /linux/fs/verity/Makefile

f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 - Merge drm/drm-next into drm-misc-next

Tue, 16 Mar 2021 09:06:23 +0100

Merge drm/drm-next into drm-misc-nextNoralf needs some patches in 5.12-rc3, and we've been delaying the 5.12merge due to the swap issue so it looks like a good time.Signed-off-by: Maxime Ripard List of files: /linux/fs/verity/Makefile

b470ebc9e0e57f53d1db9c49b8a3de4086babd05 - Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Sun, 14 Mar 2021 16:34:35 +0100

Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip fixes from Marc Zyngier: - More compatible strings for the Ingenic irqchip (introducing the JZ4760B SoC) - Select GENERIC_IRQ_MULTI_HANDLER on the ARM ep93xx platform - Drop all GENERIC_IRQ_MULTI_HANDLER selections from the irqchip Kconfig, now relying on the architecture to get it right - Drop the debugfs_file field from struct irq_domain, now that debugfs can track things on its own List of files: /linux/fs/verity/Makefile

35bb28ece90dfb7f72b77ba529f25f79323d9581 - Merge drm/drm-next into drm-intel-next

Thu, 11 Mar 2021 07:19:46 +0100

Merge drm/drm-next into drm-intel-nextSync up with upstream.Signed-off-by: Jani Nikula List of files: /linux/fs/verity/Makefile

4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 - Merge branch 'fixes-rc2' into fixes

Mon, 08 Mar 2021 10:34:12 +0100

Merge branch 'fixes-rc2' into fixes List of files: /linux/fs/verity/Makefile

cdd38c5f1ce4398ec58fec95904b75824daab7b5 - Merge remote-tracking branch 'net/master'

Wed, 24 Feb 2021 13:36:58 +0100

Merge remote-tracking branch 'net/master' List of files: /linux/fs/verity/Makefile

72d6e4871f0457dc9e498f8437ea344ee6b78075 - Merge commit '3e10585335b7967326ca7b4118cada0d2d00a2ab' into v5.12/vfio/next

Mon, 22 Feb 2021 18:14:24 +0100

Merge commit '3e10585335b7967326ca7b4118cada0d2d00a2ab' into v5.12/vfio/nextUpdate to new follow_pte() definition List of files: /linux/fs/verity/Makefile

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

Sun, 21 Feb 2021 19:25:24 +0100

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscryptPull fsverity updates from Eric Biggers: "Add an ioctl which allows reading fs-verity metadata from a file. This is useful when a file with fs-verity enabled needs to be served somewhere, and the other end wants to do its own fs-verity compatible verification of the file. See the commit messages for details. This new ioctl has been tested using new xfstests I've written for it"* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: fs-verity: support reading signature with ioctl fs-verity: support reading descriptor with ioctl fs-verity: support reading Merkle tree with ioctl fs-verity: add FS_IOC_READ_VERITY_METADATA ioctl fs-verity: don't pass whole descriptor to fsverity_verify_signature() fs-verity: factor out fsverity_get_descriptor() List of files: /linux/fs/verity/Makefile

e17fe6579de023725ec22a16965e9099e4a05ac9 - fs-verity: add FS_IOC_READ_VERITY_METADATA ioctl

Fri, 15 Jan 2021 19:18:16 +0100

fs-verity: add FS_IOC_READ_VERITY_METADATA ioctlAdd an ioctl FS_IOC_READ_VERITY_METADATA which will allow reading veritymetadata from a file that has fs-verity enabled, including:- The Merkle tree- The fsverity_descriptor (not including the signature if present)- The built-in signature, if presentThis ioctl has similar semantics to pread(). It is passed the type ofmetadata to read (one of the above three), and a buffer, offset, andsize. It returns the number of bytes read or an error.Separate patches will add support for each of the above metadata types.This patch just adds the ioctl itself.This ioctl doesn't make any assumption about where the metadata isstored on-disk. It does assume the metadata is in a stable format, butthat's basically already the case:- The Merkle tree and fsverity_descriptor are defined by how fs-verity file digests are computed; see the "File digest computation" section of Documentation/filesystems/fsverity.rst. Technically, the way in which the levels of the tree are ordered relative to each other wasn't previously specified, but it's logical to put the root level first.- The built-in signature is the value passed to FS_IOC_ENABLE_VERITY.This ioctl is useful because it allows writing a server program thattakes a verity file and serves it to a client program, such that theclient can do its own fs-verity compatible verification of the file.This only makes sense if the client doesn't trust the server and if theserver needs to provide the storage for the client.More concretely, there is interest in using this ability in Android toexport APK files (which are protected by fs-verity) to "protected VMs".This would use Protected KVM (https://lwn.net/Articles/836693), whichprovides an isolated execution environment without having to trust thetraditional "host". A "guest" VM can boot from a signed image andperform specific tasks in a minimum trusted environment using files thathave fs-verity enabled on the host, without trusting the host orrequiring that the guest has its own trusted storage.Technically, it would be possible to duplicate the metadata and store itin separate files for serving. However, that would be less efficientand would require extra care in userspace to maintain file consistency.In addition to the above, the ability to read the built-in signatures isuseful because it allows a system that is using the in-kernel signatureverification to migrate to userspace signature verification.Link: https://lore.kernel.org/r/20210115181819.34732-4-ebiggers@kernel.orgReviewed-by: Victor Hsieh Acked-by: Jaegeuk Kim Reviewed-by: Chao Yu Signed-off-by: Eric Biggers List of files: /linux/fs/verity/Makefile