Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e5e692f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 46c291e2 9ab7d228

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/xen/mm.c

+0 −1
Original line number Diff line number Diff line
@@ -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>