From: Konrad Rzeszutek Wilk Date: Wed, 12 Aug 2015 19:20:26 +0000 (-0400) Subject: Merge branch 'backports-for-konrad' of git://ca-git.us.oracle.com/linux-eufimtse... X-Git-Tag: v4.1.12-92~304^2^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f20c607a634f38160cc4ba06404ced9cdc23fda7;p=users%2Fjedix%2Flinux-maple.git Merge branch 'backports-for-konrad' of git://ca-git.us.oracle.com/linux-eufimtse-public into uek-4.1/xen * 'backports-for-konrad' of git://ca-git.us.oracle.com/linux-eufimtse-public: (31 commits) xen-netfront: Remove the meaningless code net/xen-netfront: Correct printf format in xennet_get_responses xen-netfront: Use setup_timer xen/xenbus: Don't leak memory when unmapping the ring on HVM backend Revert "xen/events/fifo: Handle linked events when closing a port" x86/xen: build "Xen PV" APIC driver for domU as well xen/events/fifo: Handle linked events when closing a port xen: release lock occasionally during ballooning xen/gntdevt: Fix race condition in gntdev_release() block/xen-blkback: s/nr_pages/nr_segs/ block/xen-blkfront: Remove invalid comment arm/xen: Drop duplicate define mfn_to_virt xen/grant-table: Remove unused macro SPP xen/xenbus: client: Fix call of virt_to_mfn in xenbus_grant_ring xen: Include xen/page.h rather than asm/xen/page.h kconfig: add xenconfig defconfig helper kconfig: clarify kvmconfig is for kvm xen/pcifront: Remove usage of struct timeval xen/tmem: use BUILD_BUG_ON() in favor of BUG_ON() hvc_xen: avoid uninitialized variable warning ... Backports from Linux 4.1 Signed-off-by: Konrad Rzeszutek Wilk --- f20c607a634f38160cc4ba06404ced9cdc23fda7