Changes in Makefile

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/drivers/crypto/caam/Makefile

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

Tue, 16 Sep 2025 12:53:20 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerge in order to get the commit: 048832a3f400 ("drm/i915: Refactor shmem_pwrite() to use kiocb and write_iter")To drm-intel-gt-next as there are followup fixes to be applied.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/crypto/caam/Makefile

a53d0cf7f1cb3182ad533ff5cacfa5fd29c419ad - Merge commit 'linus' into core/bugs, to resolve conflicts

Tue, 05 Aug 2025 11:15:34 +0200

Merge commit 'linus' into core/bugs, to resolve conflictsResolve conflicts with this commit that was developed in parallelduring the merge window: 8c8efa93db68 ("x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust") Conflicts: arch/riscv/include/asm/bug.h arch/x86/include/asm/bug.hSigned-off-by: Ingo Molnar List of files: /linux/drivers/crypto/caam/Makefile

8b87f67b4c87452e21721887fa8dec1f4c6b2b7c - Merge branch 'next' into for-linus

Wed, 08 Oct 2025 06:53:13 +0200

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

4b051897df2375414587a245ecb9bb1a4d26b3b8 - Merge tag 'v6.17-rc2' into HEAD

Thu, 21 Aug 2025 20:46:49 +0200

Merge tag 'v6.17-rc2' into HEADSync up with mainline to bring in changes to include/linux/sprintf.h List of files: /linux/drivers/crypto/caam/Makefile

b4d90dbc4c1bc4bd3eb2d2989330af0eb95c98e8 - Merge drm/drm-next into drm-misc-next-fixes

Mon, 15 Sep 2025 10:23:28 +0200

Merge drm/drm-next into drm-misc-next-fixesBackmerging to drm-misc-next-fixes to get features and fixes fromv6.17-rc6.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/crypto/caam/Makefile

702fdf3513b045f596f836d9a4b8672c76f11834 - Merge drm/drm-next into drm-intel-next

Wed, 10 Sep 2025 14:01:42 +0200

Merge drm/drm-next into drm-intel-nextCatching up with some display dependencies.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/crypto/caam/Makefile

ca994e8922f25f7fed2075098f185cf198109eaa - Merge drm/drm-next into drm-xe-next

Tue, 12 Aug 2025 14:58:37 +0200

Merge drm/drm-next into drm-xe-nextBring v6.17-rc1 to propagate commits from other subsystems, particularlyPCI, which has some new functions needed for SR-IOV integration.Signed-off-by: Lucas De Marchi List of files: /linux/drivers/crypto/caam/Makefile

08c51f5bddc81c8c97c1eb11861b0dc009e5ccd8 - Merge drm/drm-next into drm-misc-n

Mon, 11 Aug 2025 14:37:45 +0200

Merge drm/drm-next into drm-misc-nUpdating drm-misc-next to the state of v6.17-rc1. Begins a new releasecycle.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/crypto/caam/Makefile

8d2b0853add1d7534dc0794e3c8e0b9e8c4ec640 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 11 Aug 2025 16:49:06 +0200

Merge drm/drm-fixes into drm-misc-fixesUpdating drm-misc-fixes to the state of v6.17-rc1. Begins a new releasecycle.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/crypto/caam/Makefile

44a8c96edd0ee9320a1ad87afc7b10f38e55d5ec - Merge tag 'v6.17-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Thu, 31 Jul 2025 18:45:28 +0200

Merge tag 'v6.17-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto update from Herbert Xu: "API: - Allow hash drivers without fallbacks (e.g., hardware key) Algorithms: - Add hmac hardware key support (phmac) on s390 - Re-enable sha384 in FIPS mode - Disable sha1 in FIPS mode - Convert zstd to acomp Drivers: - Lower priority of qat skcipher and aead - Convert aspeed to partial block API - Add iMX8QXP support in caam - Add rate limiting support for GEN6 devices in qat - Enable telemetry for GEN6 devices in qat - Implement full backlog mode for hisilicon/sec2"* tag 'v6.17-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits) crypto: keembay - Use min() to simplify ocs_create_linked_list_from_sg() crypto: hisilicon/hpre - fix dma unmap sequence crypto: qat - make adf_dev_autoreset() static crypto: ccp - reduce stack usage in ccp_run_aes_gcm_cmd crypto: qat - refactor ring-related debug functions crypto: qat - fix seq_file position update in adf_ring_next() crypto: qat - fix DMA direction for compression on GEN2 devices crypto: jitter - replace ARRAY_SIZE definition with header include crypto: engine - remove {prepare,unprepare}_crypt_hardware callbacks crypto: engine - remove request batching support crypto: qat - flush misc workqueue during device shutdown crypto: qat - enable rate limiting feature for GEN6 devices crypto: qat - add compression slice count for rate limiting crypto: qat - add get_svc_slice_cnt() in device data structure crypto: qat - add adf_rl_get_num_svc_aes() in rate limiting crypto: qat - relocate service related functions crypto: qat - consolidate service enums crypto: qat - add decompression service for rate limiting crypto: qat - validate service in rate limiting sysfs api crypto: hisilicon/sec2 - implement full backlog mode for sec ... List of files: /linux/drivers/crypto/caam/Makefile

75e2d4b1eddcfafd3b3961490f7da0bae4ecb451 - crypto: caam - avoid option aliasing with the CONFIG_CAAM_QI build option

Tue, 01 Jul 2025 13:20:45 +0200

crypto: caam - avoid option aliasing with the CONFIG_CAAM_QI build optionIn the Makefile, the new build option CONFIG_CAAM_QI is defined conditionedon the existence of the CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI, which isproperly defined in the Kconfig file. So, CONFIG_CAAM_QI is just a localalias for CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI.There is little benefit in the source code of having this slightly shorteralias for this configuration, but it complicates further maintenance, assearching for the impact of CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QIrequires to grep once, and then identify the option introduced and continuesearching for that. Further, tools, such as cross referencers, and scriptsto check Kconfig definitions and their use simply do not handle thissituation. Given that this is the only incidence of such a config alias inthe whole kernel tree, just prefer to avoid this pattern of aliasing here.Use CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI throughout the FreescaleCAAM-Multicore platform driver backend source code.No functional change.Signed-off-by: Lukas Bulwahn Reviewed-by: Horia Geantă Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/caam/Makefile

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/drivers/crypto/caam/Makefile

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/drivers/crypto/caam/Makefile

97acb6a8fcc4e5c2cdc2693a35acdc5a7461aaa3 - Merge drm/drm-next into drm-intel-gt-next

Mon, 03 Oct 2022 18:04:02 +0200

Merge drm/drm-next into drm-intel-gt-nextDaniele needs 84d4333c1e28 ("misc/mei: Add NULL check to component matchcallback functions") in order to merge the DG2 HuC patches.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/crypto/caam/Makefile

446279168e030fd0ed68e2bba336bef8bb3da352 - Merge part of branch 'for-next.instantiate' into for-next

Fri, 05 Aug 2022 18:37:03 +0200

Merge part of branch 'for-next.instantiate' into for-next List of files: /linux/drivers/crypto/caam/Makefile

fc30eea1542dd787c6aa46e970014e97e390c5b2 - Merge drm/drm-next into drm-intel-next

Thu, 04 Aug 2022 16:19:24 +0200

Merge drm/drm-next into drm-intel-nextSync up. In special to get the drm-intel-gt-next stuff.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/crypto/caam/Makefile

8bb5e7f4dcd9b9ef22a3ea25c9066a8a968f12dd - Merge branch 'next' into for-linus

Tue, 02 Aug 2022 19:06:12 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.20 (or 6.0) merge window. List of files: /linux/drivers/crypto/caam/Makefile

f83d9396d1f63048c423efa00e4e244da10a35fd - Merge drm/drm-next into drm-misc-next-fixes

Thu, 14 Jul 2022 09:57:37 +0200

Merge drm/drm-next into drm-misc-next-fixesBackmerging from drm/drm-next for the final fixes that will gointo v5.20.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/crypto/caam/Makefile

a63f7778f76e1cf8ed3bcb7a1d9453c9609121ad - Merge tag 'v5.19-rc5' into next

Fri, 08 Jul 2022 22:39:28 +0200

Merge tag 'v5.19-rc5' into nextMerge with mainline to bring up the latest definition from MFD subsystemneeded for Mediatek keypad driver. List of files: /linux/drivers/crypto/caam/Makefile