Linus Torvalds 4203d0eb3a Bug-fixes: ... - Fix balloon driver for auto-translate guests (PVHVM, ARM) to not use scratch pages. - Fix block API header for ARM32 and ARM64 to have proper layout - On ARM when mapping guests, stick on PTE_SPECIAL - When using SWIOTLB under ARM, don't call swiotlb functions twice - When unmapping guests memory and if we fail, don't return pages which failed to be unmapped. - Grant driver was using the wrong address on ARM. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQEcBAABAgAGBQJSsdFEAAoJEFjIrFwIi8fJDQwIAL1ygSTwSXdH6TlqtD9GVdsE G6kiCM7G6VXrKMf8zBtgbGpcl6FT0zOIz4cRcXbyDniuHTjdWuH9dlmZOzFMAirE uMWwOB1EfmRBEJRsd2pW0Gj0O6VABWh8BHklFCeWUvk/Stlw9uXqIwf7Pjcj6wPT XW+ZywqsAve4MM60Rz/nMsakLcTK4i5SCRgPPFgAnPKUod3f/QbEHwci/lpinJFv AuQp2JytCsDc2nehEi1kMwEx7LLBlUcjXTqPG5lhQnXrFleDtMdCJd9dGjeze7Qu F5sftfdlp18ojQwegv1PGiVI4jV8rIq29ybaef/y9DLd3nC3rmi8B8/m9RG2qyI= =dUsw -----END PGP SIGNATURE----- Merge tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip Pull Xen bugfixes from Konrad Rzeszutek Wilk: - Fix balloon driver for auto-translate guests (PVHVM, ARM) to not use scratch pages. - Fix block API header for ARM32 and ARM64 to have proper layout - On ARM when mapping guests, stick on PTE_SPECIAL - When using SWIOTLB under ARM, don't call swiotlb functions twice - When unmapping guests memory and if we fail, don't return pages which failed to be unmapped. - Grant driver was using the wrong address on ARM. * tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/balloon: Seperate the auto-translate logic properly (v2) xen/block: Correctly define structures in public headers on ARM32 and ARM64 arm: xen: foreign mapping PTEs are special. xen/arm64: do not call the swiotlb functions twice xen: privcmd: do not return pages which we have failed to unmap XEN: Grant table address, xen_hvm_resume_frames, is a phys_addr not a pfn		2013-12-20 09:34:54 -08:00
..
acpi	Merge branch 'acpica'	2013-11-27 01:03:27 +01:00
asm-generic	mm: fix TLB flush race between migration, and change_protection_range	2013-12-18 19:04:51 -08:00
clocksource
crypto	crypto: scatterwalk - Use sg_chain_ptr on chain entries	2013-12-09 19:58:52 +08:00
drm	Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes	2013-11-21 18:46:56 +10:00
dt-bindings	For the 3.13 merge window we have a couple of new drivers for the AMS	2013-11-15 16:37:40 -08:00
keys
kvm
linux	mm: numa: guarantee that tlb_flush_pending updates are visible before page table updates	2013-12-18 19:04:51 -08:00
math-emu
media	[media] videobuf2: Add support for file access mode flags for DMABUF exporting	2013-12-09 14:50:50 -02:00
memory
misc
net	sctp: properly latch and use autoclose value from sock to association	2013-12-10 22:41:26 -05:00
pcmcia
ras
rdma	Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next	2013-11-17 08:22:19 -08:00
rxrpc
scsi	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
sound	ALSA: memalloc.h - fix wrong truncation of dma_addr_t	2013-12-10 15:30:46 +01:00
target	target_core_alua: Store supported ALUA states	2013-11-20 11:26:37 -08:00
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-02 10:13:09 -08:00
uapi	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-19 09:10:46 -08:00
video	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
xen	Bug-fixes:	2013-12-20 09:34:54 -08:00
Kbuild