Re: [GIT PULL] dma-mapping file renames for Linux 4.18

From: Christoph Hellwig
Date: Wed Jun 20 2018 - 00:34:22 EST


On Wed, Jun 20, 2018 at 07:52:53AM +0900, Linus Torvalds wrote:
> On Tue, Jun 19, 2018 at 1:44 PM Christoph Hellwig <hch@xxxxxxxxxxxxx> wrote:
> >
> > below is a rename of the assorted dma-mapping files to that they live
> > under kernel/dma and lose their dma-* prefixes. If there is any time
> > to do this it is right after -rc1, so let me know if this is something
> > you'd take.
>
> I iwas going to take it, but then I noticed that it's an unsigned tag
> from a random site.
>
> Yeah, yeah, I have pulled such things in the past, but I'm really
> trying to convince people to use signed tags.
>
> I prefer signed tags even on kernel.org, where I know the security is
> tight. On other sites, I really want that warm fuzzy feeling of
> knowing that yeah, you actually put that code there.

In fact it wasn't tagged at all, just a branch as I simplify forgot
to tag it. Tagged version is here:

The following changes since commit be779f03d563981c65cc7417cc5e0dbbc5b89d30:

Merge tag 'kbuild-v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild (2018-06-13 08:40:34 -0700)

are available in the Git repository at:

git://git.infradead.org/users/hch/dma-mapping.git tags/dma-rename-4.18

for you to fetch changes up to cf65a0f6f6ff7631ba0ac0513a14ca5b65320d80:

dma-mapping: move all DMA mapping code to kernel/dma (2018-06-14 08:50:37 +0200)

----------------------------------------------------------------
Move all the dma-mapping code to kernel/dma

----------------------------------------------------------------
Christoph Hellwig (2):
dma-mapping: use obj-y instead of lib-y for generic dma ops
dma-mapping: move all DMA mapping code to kernel/dma

Documentation/driver-api/infrastructure.rst | 4 +-
MAINTAINERS | 9 +---
drivers/base/Makefile | 3 --
include/linux/dma-contiguous.h | 2 +-
init/Kconfig | 4 --
kernel/Makefile | 1 +
kernel/dma/Kconfig | 50 ++++++++++++++++++++++
kernel/dma/Makefile | 11 +++++
.../base/dma-coherent.c => kernel/dma/coherent.c | 0
.../dma-contiguous.c => kernel/dma/contiguous.c | 0
lib/dma-debug.c => kernel/dma/debug.c | 0
lib/dma-direct.c => kernel/dma/direct.c | 0
drivers/base/dma-mapping.c => kernel/dma/mapping.c | 2 +-
lib/dma-noncoherent.c => kernel/dma/noncoherent.c | 0
{lib => kernel/dma}/swiotlb.c | 0
lib/dma-virt.c => kernel/dma/virt.c | 2 -
lib/Kconfig | 47 +-------------------
lib/Makefile | 6 ---
18 files changed, 69 insertions(+), 72 deletions(-)
create mode 100644 kernel/dma/Kconfig
create mode 100644 kernel/dma/Makefile
rename drivers/base/dma-coherent.c => kernel/dma/coherent.c (100%)
rename drivers/base/dma-contiguous.c => kernel/dma/contiguous.c (100%)
rename lib/dma-debug.c => kernel/dma/debug.c (100%)
rename lib/dma-direct.c => kernel/dma/direct.c (100%)
rename drivers/base/dma-mapping.c => kernel/dma/mapping.c (99%)
rename lib/dma-noncoherent.c => kernel/dma/noncoherent.c (100%)
rename {lib => kernel/dma}/swiotlb.c (100%)
rename lib/dma-virt.c => kernel/dma/virt.c (98%)