]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'uek4/topic/uek-4.1/xen-bug26107942' into uek/uek-next/for-chander-bug26...
authorJoao Martins <joao.m.martins@oracle.com>
Thu, 1 Jun 2017 12:21:56 +0000 (13:21 +0100)
committerJoao Martins <joao.m.martins@oracle.com>
Thu, 1 Jun 2017 12:21:56 +0000 (13:21 +0100)
commite78bfbc81feeafa24cc084ba0126aeb6f4dbb550
tree5d7f6d9f79dc08cfcb1743fad1ca0c5c7a4484bc
parent3503ee27726caee735cccf34e389916669877073
parentfb9041f4f7f601c03d8f8e2fb89aa391009b523a
Merge branch 'uek4/topic/uek-4.1/xen-bug26107942' into uek/uek-next/for-chander-bug26107942

 Conflicts:
arch/x86/xen/enlighten.c
drivers/net/xen-netfront.c
fs/proc/generic.c
fs/proc/internal.h

arch/x86/xen/enlighten.c had one header to not be conditionally include with
CONFIG_KEXEC introduced by commit 28a4be540b ("kexec: allow kdump with
crash_kexec_post_notifiers"); fs/proc/* had required exporting a new
symbol to be used by commit ac7bd1728ac4 ("xenfs: Use
proc_create_mount_point() to create /proc/xen"); finally the
xen-netfront.c had already accounted for the changes introduced by
9e13456b6312 and 0d1d6389b930 - hence we simply retain the topic branch
version.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
arch/x86/xen/enlighten.c
drivers/block/xen-blkback/xenbus.c
drivers/net/xen-netback/xenbus.c
drivers/net/xen-netfront.c
drivers/pci/xen-pcifront.c
drivers/xen/events/events_base.c