diff for duplicates of <20170620124140.GA27163@lst.de> diff --git a/a/1.txt b/N1/1.txt index 9b577bd..35cacd5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,47 +15,3 @@ And below is the patch to add the MAINTAINERS entry, additions welcome. Stephen, can you add this to linux-next? --- -From 335979c41912e6c101a20b719862b2d837370df1 Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig <hch@lst.de> -Date: Tue, 20 Jun 2017 11:17:30 +0200 -Subject: MAINTAINERS: add entry for dma mapping helpers -Content-Length: 1124 -Lines: 38 - -This code has been spread between getting in through arch trees, the iommu -tree, -mm and the drivers tree. There will be a lot of work in this area, -including consolidating various arch implementations into more common -code, so ensure we have a proper git tree that facilitates cooperation with -the architecture maintainers. - -Signed-off-by: Christoph Hellwig <hch@lst.de> ---- - MAINTAINERS | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/MAINTAINERS b/MAINTAINERS -index 09b5ab6a8a5c..56859d53a424 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -2595,6 +2595,19 @@ S: Maintained - F: net/bluetooth/ - F: include/net/bluetooth/ - -+DMA MAPPING HELPERS -+M: Christoph Hellwig <hch@lst.de> -+L: linux-kernel@vger.kernel.org -+T: git git://git.infradead.org/users/hch/dma-mapping.git -+W: http://git.infradead.org/users/hch/dma-mapping.git -+S: Supported -+F: lib/dma-debug.c -+F: lib/dma-noop.c -+F: lib/dma-virt.c -+F: drivers/base/dma-mapping.c -+F: drivers/base/dma-coherent.c -+F: include/linux/dma-mapping.h -+ - BONDING DRIVER - M: Jay Vosburgh <j.vosburgh@gmail.com> - M: Veaceslav Falico <vfalico@gmail.com> --- -2.11.0 diff --git a/a/content_digest b/N1/content_digest index 4a75745..5a81a9c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -42,50 +42,6 @@ "\n" "Stephen, can you add this to linux-next?\n" "\n" - "---\n" - "From 335979c41912e6c101a20b719862b2d837370df1 Mon Sep 17 00:00:00 2001\n" - "From: Christoph Hellwig <hch@lst.de>\n" - "Date: Tue, 20 Jun 2017 11:17:30 +0200\n" - "Subject: MAINTAINERS: add entry for dma mapping helpers\n" - "Content-Length: 1124\n" - "Lines: 38\n" - "\n" - "This code has been spread between getting in through arch trees, the iommu\n" - "tree, -mm and the drivers tree. There will be a lot of work in this area,\n" - "including consolidating various arch implementations into more common\n" - "code, so ensure we have a proper git tree that facilitates cooperation with\n" - "the architecture maintainers.\n" - "\n" - "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" - "---\n" - " MAINTAINERS | 13 +++++++++++++\n" - " 1 file changed, 13 insertions(+)\n" - "\n" - "diff --git a/MAINTAINERS b/MAINTAINERS\n" - "index 09b5ab6a8a5c..56859d53a424 100644\n" - "--- a/MAINTAINERS\n" - "+++ b/MAINTAINERS\n" - "@@ -2595,6 +2595,19 @@ S:\tMaintained\n" - " F:\tnet/bluetooth/\n" - " F:\tinclude/net/bluetooth/\n" - " \n" - "+DMA MAPPING HELPERS\n" - "+M:\tChristoph Hellwig <hch@lst.de>\n" - "+L:\tlinux-kernel@vger.kernel.org\n" - "+T:\tgit git://git.infradead.org/users/hch/dma-mapping.git\n" - "+W:\thttp://git.infradead.org/users/hch/dma-mapping.git\n" - "+S:\tSupported\n" - "+F:\tlib/dma-debug.c\n" - "+F:\tlib/dma-noop.c\n" - "+F:\tlib/dma-virt.c\n" - "+F:\tdrivers/base/dma-mapping.c\n" - "+F:\tdrivers/base/dma-coherent.c\n" - "+F:\tinclude/linux/dma-mapping.h\n" - "+\n" - " BONDING DRIVER\n" - " M:\tJay Vosburgh <j.vosburgh@gmail.com>\n" - " M:\tVeaceslav Falico <vfalico@gmail.com>\n" - "-- \n" - 2.11.0 + --- -22cb48f34017da1c06e402a034fb4b53cefeb57e363c4c1ba7eddba4fb96c640 +75f0457c380ed47ff9a1890df7b34cf1fdf08491f2eb686753430449e5494ad4
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox