Carlos Llamas 9a4f6c6b92 Merge 87768582a4 ("Merge tag 'dma-mapping-7.1-2026-04-16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux") into android-mainline ...

Steps on the way to v7.1-rc1

Resolves merge conflicts in:
	drivers/dma-buf/heaps/system_heap.c

Cc: John Stultz <jstultz@google.com>
Cc: T.J. Mercier <tjmercier@google.com>
Change-Id: I2f4c8746606cfc812728389c87bbeecb5c8623d1
Signed-off-by: Carlos Llamas <cmllamas@google.com>

2026-05-22 18:28:01 +00:00

..

cma_heap.c

Merge 87768582a4 ("Merge tag 'dma-mapping-7.1-2026-04-16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux") into android-mainline

2026-05-22 18:28:01 +00:00

Kconfig

Reapply "ANDROID: dma-buf: heaps: Allow cma heaps to be configured as a module"

2026-01-08 09:56:13 -08:00

Makefile

…

system_heap.c

Merge 87768582a4 ("Merge tag 'dma-mapping-7.1-2026-04-16' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux") into android-mainline

2026-05-22 18:28:01 +00:00