diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-09 11:41:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-09 11:41:22 -0700 |
| commit | 474197a4f7921a97aa1aabc6f759823a024ff25f (patch) | |
| tree | c0fc656bc2dc73dc0b9770656d4f6e25b95ced95 /fs/xfs/xfs_trans_buf.c | |
| parent | 060249b5d3447a84c91f22276d3fec723363319d (diff) | |
| parent | f875db4f20f4ec2e4fa3b3be0e5081976e0b5dad (diff) | |
Merge tag 'dma-mapping-6.6-2023-09-09' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
- move a dma-debug call that prints a message out from a lock that's
causing problems with the lock order in serial drivers (Sergey
Senozhatsky)
- fix the CONFIG_DMA_NUMA_CMA Kconfig entry to have the right
dependency and not default to y (Christoph Hellwig)
- move an ifdef a bit to remove a __maybe_unused that seems to trip up
some sensitivities (Christoph Hellwig)
- revert a bogus check in the CMA allocator (Zhenhua Huang)
* tag 'dma-mapping-6.6-2023-09-09' of git://git.infradead.org/users/hch/dma-mapping:
Revert "dma-contiguous: check for memory region overlap"
dma-pool: remove a __maybe_unused label in atomic_pool_expand
dma-contiguous: fix the Kconfig entry for CONFIG_DMA_NUMA_CMA
dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock
Diffstat (limited to 'fs/xfs/xfs_trans_buf.c')
0 files changed, 0 insertions, 0 deletions