From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Feb 2012 23:20:11 +0000 (-0800)
Subject: Merge tag 'stable/for-linus-fixes-3.3-rc3' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=694ce18ec3485f5b0a4f3820073f5e2b0b4e0870;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'stable/for-linus-fixes-3.3-rc3' of git://git./linux/kernel/git/konrad/xen

Two fixes for VCPU offlining; One to fix the string format exposed
by the xen-pci[front|back] to conform to the one used in majority of
PCI drivers; Two fixes to make the code more resilient to invalid
configurations.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

* tag 'stable/for-linus-fixes-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xenbus_dev: add missing error check to watch handling
  xen/pci[front|back]: Use %d instead of %1x for displaying PCI devfn.
  xen pvhvm: do not remap pirqs onto evtchns if !xen_have_vector_callback
  xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic.
  xen/bootup: During bootup suppress XENBUS: Unable to read cpu state
---

694ce18ec3485f5b0a4f3820073f5e2b0b4e0870