diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-09 09:44:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-09 09:44:08 -0800 |
| commit | 3e5e692fcd6ce0d63d8c9bd8677d9aaeec61d70e (patch) | |
| tree | 98af3e020479a18dfe4726085a8c113135749e1e | |
| parent | 46c291e277f93737877305f5626a2c5c35522cb1 (diff) | |
| parent | 9ab7d228e972b50d06ee28076ab5d0f93e862463 (diff) | |
| download | linux-3e5e692fcd6ce0d63d8c9bd8677d9aaeec61d70e.tar.bz2 | |
Merge tag 'for-linus-5.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Two very minor fixes: one remove of a #include for an unused header
and a fix of the xen ML address in MAINTAINERS"
* tag 'for-linus-5.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
MAINTAINERS: unify reference to xen-devel list
arch/arm/xen: Remove duplicate header
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm/xen/mm.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 825dc2b7453d..6a6d2f39ded1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5186,7 +5186,7 @@ DRM DRIVERS FOR XEN M: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> T: git git://anongit.freedesktop.org/drm/drm-misc L: dri-devel@lists.freedesktop.org -L: xen-devel@lists.xen.org +L: xen-devel@lists.xenproject.org (moderated for non-subscribers) S: Supported F: drivers/gpu/drm/xen/ F: Documentation/gpu/xen-front.rst diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index cb44aa290e73..e1d44b903dfc 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -7,7 +7,6 @@ #include <linux/of_address.h> #include <linux/slab.h> #include <linux/types.h> -#include <linux/dma-mapping.h> #include <linux/vmalloc.h> #include <linux/swiotlb.h> |