Changes in Makefile

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/drivers/tee/optee/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/tee/optee/Makefile

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/drivers/tee/optee/Makefile

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/drivers/tee/optee/Makefile

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/drivers/tee/optee/Makefile

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/drivers/tee/optee/Makefile

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/drivers/tee/optee/Makefile

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/drivers/tee/optee/Makefile

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/drivers/tee/optee/Makefile

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/drivers/tee/optee/Makefile

38057e323657695ec8f814aff0cdd1c7e00d3e9b - Merge tag 'soc-drivers-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Thu, 02 Oct 2025 02:32:51 +0200

Merge tag 'soc-drivers-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/socPull SoC driver updates from Arnd Bergmann: "Lots of platform specific updates for Qualcomm SoCs, including a new TEE subsystem driver for the Qualcomm QTEE firmware interface. Added support for the Apple A11 SoC in drivers that are shared with the M1/M2 series, among more updates for those. Smaller platform specific driver updates for Renesas, ASpeed, Broadcom, Nvidia, Mediatek, Amlogic, TI, Allwinner, and Freescale SoCs. Driver updates in the cache controller, memory controller and reset controller subsystems. SCMI firmware updates to add more features and improve robustness. This includes support for having multiple SCMI providers in a single system. TEE subsystem support for protected DMA-bufs, allowing hardware to access memory areas that managed by the kernel but remain inaccessible from the CPU in EL1/EL0"* tag 'soc-drivers-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (139 commits) soc/fsl/qbman: Use for_each_online_cpu() instead of for_each_cpu() soc: fsl: qe: Drop legacy-of-mm-gpiochip.h header from GPIO driver soc: fsl: qe: Change GPIO driver to a proper platform driver tee: fix register_shm_helper() pmdomain: apple: Add "apple,t8103-pmgr-pwrstate" dt-bindings: spmi: Add Apple A11 and T2 compatible serial: qcom-geni: Load UART qup Firmware from linux side spi: geni-qcom: Load spi qup Firmware from linux side i2c: qcom-geni: Load i2c qup Firmware from linux side soc: qcom: geni-se: Add support to load QUP SE Firmware via Linux subsystem soc: qcom: geni-se: Cleanup register defines and update copyright dt-bindings: qcom: se-common: Add QUP Peripheral-specific properties for I2C, SPI, and SERIAL bus Documentation: tee: Add Qualcomm TEE driver tee: qcom: enable TEE_IOC_SHM_ALLOC ioctl tee: qcom: add primordial object tee: add Qualcomm TEE driver tee: increase TEE_MAX_ARG_SIZE to 4096 tee: add TEE_IOCTL_PARAM_ATTR_TYPE_OBJREF tee: add TEE_IOCTL_PARAM_ATTR_TYPE_UBUF tee: add close_context to TEE driver operation ... List of files: /linux/drivers/tee/optee/Makefile

820429d53bd7c8b19beb5686540f372be2a18eea - Merge tag 'tee-prot-dma-buf-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers

Mon, 15 Sep 2025 16:05:04 +0200

Merge tag 'tee-prot-dma-buf-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/driversTEE protected DMA-bufs for v6.18- Allocates protected DMA-bufs from a DMA-heap instantiated from the TEE subsystem.- The DMA-heap uses a protected memory pool provided by the backend TEE driver, allowing it to choose how to allocate the protected physical memory.- Three use-cases (Secure Video Playback, Trusted UI, and Secure Video Recording) have been identified so far to serve as examples of what can be expected.- The use-cases have predefined DMA-heap names, "protected,secure-video", "protected,trusted-ui", and "protected,secure-video-record". The backend driver registers protected memory pools for the use-cases it supports.* tag 'tee-prot-dma-buf-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee: optee: smc abi: dynamic protected memory allocation optee: FF-A: dynamic protected memory allocation optee: support protected memory allocation tee: add tee_shm_alloc_dma_mem() tee: new ioctl to a register tee_shm from a dmabuf file descriptor tee: refactor params_from_user() tee: implement protected DMA-heap dma-buf: dma-heap: export declared functions optee: sync secure world ABI headersLink: https://lore.kernel.org/r/20250912101752.GA1453408@raydenSigned-off-by: Arnd Bergmann List of files: /linux/drivers/tee/optee/Makefile

2b78d79cdf963e09ec8b90c55216b6ab5a83dbaf - optee: FF-A: dynamic protected memory allocation

Wed, 13 Aug 2025 08:02:57 +0200

optee: FF-A: dynamic protected memory allocationAdd support in the OP-TEE backend driver dynamic protected memoryallocation with FF-A.The protected memory pools for dynamically allocated protected memoryare instantiated when requested by user-space. This instantiation canfail if OP-TEE doesn't support the requested use-case of protectedmemory.Restricted memory pools based on a static carveout or dynamic allocationcan coexist for different use-cases. We use only dynamic allocation withFF-A.Reviewed-by: Sumit Garg Signed-off-by: Jens Wiklander List of files: /linux/drivers/tee/optee/Makefile

03ab8e6297acd1bc0eedaa050e2a1635c576fd11 - Merge tag 'v5.18'

Tue, 31 May 2022 15:13:23 +0200

Merge tag 'v5.18'Linux 5.18 List of files: /linux/drivers/tee/optee/Makefile

de4fb176622d54a82ea3ceb7362392aaf5ff0b5a - Merge branches 'fixes' and 'misc' into for-linus

Fri, 01 Apr 2022 17:12:31 +0200

Merge branches 'fixes' and 'misc' into for-linus List of files: /linux/drivers/tee/optee/Makefile

1136fa0c07de570dc17858745af8be169d1440ba - Merge tag 'v5.17-rc4' into for-linus

Tue, 01 Mar 2022 08:12:55 +0100

Merge tag 'v5.17-rc4' into for-linusMerge with mainline to get the Intel ASoC generic helpers header andother changes. List of files: /linux/drivers/tee/optee/Makefile

986c6f7c3fc855032f3457a5a1b7fbcc09c375bb - Merge tag 'v5.17-rc4' into next

Fri, 18 Feb 2022 22:30:38 +0100

Merge tag 'v5.17-rc4' into nextSync up with mainline to get the latest changes in HID subsystem. List of files: /linux/drivers/tee/optee/Makefile

542898c5aa5c6a3179dffb1d1606884a63f75fed - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

Mon, 07 Feb 2022 17:01:37 +0100

Merge remote-tracking branch 'drm/drm-next' into drm-misc-nextFirst backmerge into drm-misc-next. Required for more helpers backmerged,and to pull in 5.17 (rc2).Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/tee/optee/Makefile

7e6a6b400db8048bd1c06e497e338388413cf5bc - Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Sat, 05 Feb 2022 06:58:25 +0100

Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm64 fixes for 5.17, take #2- A couple of fixes when handling an exception while a SError has been delivered- Workaround for Cortex-A510's single-step[ erratum List of files: /linux/drivers/tee/optee/Makefile

876f7a438e4247a948268ad77b67c494f709cc30 - Merge drm/drm-next into drm-intel-gt-next

Thu, 03 Feb 2022 08:53:49 +0100

Merge drm/drm-next into drm-intel-gt-nextBackmerge to bring in 5.17-rc2 to introduce a common baselineto merge i915_regs changes from drm-intel-next.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/tee/optee/Makefile