mbox series

[GIT,PULL] dma-mapping updates for Linux 6.7

Message ID ZT-46QZiN8b37Swy@infradead.org
State New
Headers
Series [GIT,PULL] dma-mapping updates for Linux 6.7 |

Pull-request

git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-6.7-2023-10-30

Message

Christoph Hellwig Oct. 30, 2023, 2:08 p.m. UTC 
  Hi Linus,

the Kconfig dependencies added in this branch caught configuration issues
in a riscv platform.  The fixes for that went into th soc tree, so it
if you want to avoid them it might make sense to pull this branch after
the soc tree.

The following changes since commit ce55c22ec8b223a90ff3e084d842f73cfba35588:

  Merge tag 'net-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2023-10-19 12:08:18 -0700)

are available in the Git repository at:

  git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-6.7-2023-10-30

for you to fetch changes up to 36d91e851598a9ea523ad4681dd11fa661d59695:

  dma-debug: Fix a typo in a debugging eye-catcher (2023-10-23 07:52:54 +0200)

----------------------------------------------------------------
dma-mapping updates for Linux 6.7

 - get rid of the fake support for coherent DMA allocation on coldfire with
   caches (Christoph Hellwig)
 - add a few Kconfig dependencies so that Kconfig catches the use of
   invalid configurations (Christoph Hellwig)
 - fix a type in dma-debug output (Chuck Lever)
 - rewrite a comment in swiotlb (Sean Christopherson)

----------------------------------------------------------------
Christoph Hellwig (8):
      dma-direct: add dependencies to CONFIG_DMA_GLOBAL_POOL
      dma-direct: add a CONFIG_ARCH_HAS_DMA_ALLOC symbol
      dma-direct: simplify the use atomic pool logic in dma_direct_alloc
      dma-direct: warn when coherent allocations aren't supported
      m68k: use the coherent DMA code for coldfire without data cache
      net: fec: use dma_alloc_noncoherent for data cache enabled coldfire
      m68k: don't provide arch_dma_alloc for nommu/coldfire
      m68k: remove unused includes from dma.c

Chuck Lever (1):
      dma-debug: Fix a typo in a debugging eye-catcher

Sean Christopherson (1):
      swiotlb: rewrite comment explaining why the source is preserved on DMA_FROM_DEVICE

 arch/arm/Kconfig                          |  1 +
 arch/m68k/Kconfig                         |  6 +--
 arch/m68k/Kconfig.cpu                     | 12 +++++
 arch/m68k/kernel/Makefile                 |  2 +-
 arch/m68k/kernel/dma.c                    | 34 +-----------
 arch/parisc/Kconfig                       |  1 +
 drivers/net/ethernet/freescale/fec_main.c | 86 +++++++++++++++++++++++++++----
 kernel/dma/Kconfig                        | 11 ++++
 kernel/dma/debug.c                        |  2 +-
 kernel/dma/direct.c                       | 37 +++++--------
 kernel/dma/swiotlb.c                      | 12 +++--
 11 files changed, 127 insertions(+), 77 deletions(-)

Comments

Geert Uytterhoeven Oct. 31, 2023, 8:07 a.m. UTC | #1 
Hi Christoph,

On Mon, Oct 30, 2023 at 3:08 PM Christoph Hellwig <hch@infradead.org> wrote:
> the Kconfig dependencies added in this branch caught configuration issues
> in a riscv platform.  The fixes for that went into th soc tree, so it
> if you want to avoid them it might make sense to pull this branch after
> the soc tree.

FTR, these fixes were merged in v6.6.

Gr{oetje,eeting}s,

                        Geert
pr-tracker-bot@kernel.org Nov. 2, 2023, 12:01 a.m. UTC | #2 
The pull request you sent on Mon, 30 Oct 2023 15:08:41 +0100:

> git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-6.7-2023-10-30

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/009fbfc97b6367762efa257f1478ec86d37949f9

Thank you!