From: Linus Torvalds Date: Thu, 10 Dec 2009 17:34:40 +0000 (-0800) Subject: Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen X-Git-Tag: firefly_0821_release~9833^2~3908 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5;p=firefly-linux-kernel-4.4.55.git Merge branch 'xen/fbdev' of git://git./linux/kernel/git/jeremy/xen * 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers. fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers. fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag. Fix toogle whether xenbus driver should be built as module or part of kernel. --- eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5