From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Oct 2012 12:04:56 +0000 (+0900)
Subject: Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty... 
X-Git-Tag: v3.7~370
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc92b1f9ab1e1665dbbc56911782358e7f9a49f9;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'virtio-next' of git://git./linux/kernel/git/rusty/linux

Pull virtio changes from Rusty Russell:
 "New workflow: same git trees pulled by linux-next get sent straight to
  Linus.  Git is awkward at shuffling patches compared with quilt or mq,
  but that doesn't happen often once things get into my -next branch."

* 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (24 commits)
  lguest: fix occasional crash in example launcher.
  virtio-blk: Disable callback in virtblk_done()
  virtio_mmio: Don't attempt to create empty virtqueues
  virtio_mmio: fix off by one error allocating queue
  drivers/virtio/virtio_pci.c: fix error return code
  virtio: don't crash when device is buggy
  virtio: remove CONFIG_VIRTIO_RING
  virtio: add help to CONFIG_VIRTIO option.
  virtio: support reserved vqs
  virtio: introduce an API to set affinity for a virtqueue
  virtio-ring: move queue_index to vring_virtqueue
  virtio_balloon: not EXPERIMENTAL any more.
  virtio-balloon: dependency fix
  virtio-blk: fix NULL checking in virtblk_alloc_req()
  virtio-blk: Add REQ_FLUSH and REQ_FUA support to bio path
  virtio-blk: Add bio-based IO path for virtio-blk
  virtio: console: fix error handling in init() function
  tools: Fix pthread flag for Makefile of trace-agent used by virtio-trace
  tools: Add guest trace agent as a user tool
  virtio/console: Allocate scatterlist according to the current pipe size
  ...
---

dc92b1f9ab1e1665dbbc56911782358e7f9a49f9
diff --cc arch/s390/Kconfig
index f9acddd,9faf3d9..c8af429
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -656,13 -587,56 +656,12 @@@ config S390_GUES
  	depends on 64BIT && EXPERIMENTAL
  	select VIRTUALIZATION
  	select VIRTIO
- 	select VIRTIO_RING
  	select VIRTIO_CONSOLE
  	help
 -	  Select this option if you want to run the kernel as a guest under
 -	  the KVM hypervisor. This will add detection for KVM as well  as a
 -	  virtio transport. If KVM is detected, the virtio console will be
 -	  the default console.
 -
 -config SECCOMP
 -	def_bool y
 -	prompt "Enable seccomp to safely compute untrusted bytecode"
 -	depends on PROC_FS
 -	help
 -	  This kernel feature is useful for number crunching applications
 -	  that may need to compute untrusted bytecode during their
 -	  execution. By using pipes or other transports made available to
 -	  the process as file descriptors supporting the read/write
 -	  syscalls, it's possible to isolate those applications in
 -	  their own address space using seccomp. Once seccomp is
 -	  enabled via /proc/<pid>/seccomp, it cannot be disabled
 -	  and the task is only allowed to execute a few safe syscalls
 -	  defined by each seccomp mode.
 -
 -	  If unsure, say Y.
 -
 -endmenu
 +	  Enabling this option adds support for virtio based paravirtual device
 +	  drivers on s390.
  
 -menu "Power Management"
 -
 -source "kernel/power/Kconfig"
 +	  Select this option if you want to run the kernel as a guest under
 +	  the KVM hypervisor.
  
  endmenu
 -
 -source "net/Kconfig"
 -
 -config PCMCIA
 -	def_bool n
 -
 -config CCW
 -	def_bool y
 -
 -source "drivers/Kconfig"
 -
 -source "fs/Kconfig"
 -
 -source "arch/s390/Kconfig.debug"
 -
 -source "security/Kconfig"
 -
 -source "crypto/Kconfig"
 -
 -source "lib/Kconfig"
 -
 -source "arch/s390/kvm/Kconfig"