firewire-sbp-target: fix tpg_lun_list accesses
firewire-sbp-target: rip out data prefetch malarkey
firewire-sbp-target: move data block memory allocation and sg copying to
sbp_rw_data()
firewire-sbp-target: make data_buf local to sbp_rw_data()
firewire-sbp-target: rip out the multiple worker stuff for now
firewire-sbp-target: fold-in sbp_rw_data_worker()
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security layer fixlet from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  sysctl: fix write access to dmesg_restrict/kptr_restrict
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh: fix clock-sh7757 for the latest sh_mobile_sdhi driver
  serial: sh-sci: use serial_port_in/out vs sci_in/out.
  sh: vsyscall: Fix up .eh_frame generation.
  sh: dma: Fix up device attribute mismatch from sysdev fallout.
  sh: dwarf unwinder depends on SHcompact.
  sh: fix up fallout from system.h disintegration.
Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull a few KVM fixes from Avi Kivity:
 "A bunch of powerpc KVM fixes, a guest and a host RCU fix (unrelated),
  and a small build fix."

* 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Resolve RCU vs. async page fault problem
  KVM: VMX: vmx_set_cr0 expects kvm->srcu locked
  KVM: PMU: Fix integer constant is too large warning in kvm_pmu_set_msr()
  KVM: PPC: Book3S: PR: Fix preemption
  KVM: PPC: Save/Restore CR over vcpu_run
  KVM: PPC: Book3S HV: Save and restore CR in __kvmppc_vcore_entry
  KVM: PPC: Book3S HV: Fix kvm_alloc_linear in case where no linears exist
  KVM: PPC: Book3S: Compile fix for ppc32 in HIOR access code
Merge tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull two more small regmap fixes from Mark Brown:
 - Now we have users for it that aren't running Android it turns out
   that regcache_sync_region() is much more useful to drivers if it's
   exported for use by modules.  Who knew?
 - Make sure we don't divide by zero when doing debugfs dumps of
   rbtrees, not visible up until now because everything was providing at
   least some cache on startup.

* tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: prevent division by zero in rbtree_show
  regmap: Export regcache_sync_region()
Linux 3.4-rc2
Merge tag 'v3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge mainline v3.4-rc2 into lio-core.git and fix associated conflicts
from local commits.

Also, this patch drops the original virtio-scsi.c driver in favor of
what has been merged into mainline code.

Conflicts:
	drivers/infiniband/ulp/srpt/ib_srpt.c
	drivers/scsi/Kconfig
	drivers/scsi/Makefile
	drivers/scsi/qla2xxx/qla_dbg.c
	drivers/scsi/qla2xxx/qla_def.h
	drivers/scsi/qla2xxx/qla_gbl.h
	drivers/scsi/qla2xxx/qla_init.c
	drivers/scsi/qla2xxx/qla_isr.c
	drivers/scsi/qla2xxx/qla_os.c
	drivers/scsi/virtio_scsi.c
	drivers/target/iscsi/iscsi_target.c
	drivers/target/iscsi/iscsi_target_util.c
	drivers/target/loopback/tcm_loop.c
	drivers/target/target_core_cdb.c
	drivers/target/target_core_iblock.c
	drivers/target/target_core_pr.c
	drivers/target/target_core_tmr.c
	drivers/target/target_core_tpg.c
	drivers/target/target_core_transport.c
	drivers/target/tcm_fc/tcm_fc.h
	drivers/target/tcm_fc/tfc_cmd.c
	include/linux/virtio_ids.h
	include/linux/virtio_scsi.h
	include/target/target_core_base.h
	include/target/target_core_fabric.h
target/usb-gadget: Drop original remove.h for v3.4-rc

This patch removes the legacy usage of remove.h added by Sebastian
originally to lio-core.git ahead of the following changes for v3.4-rc
to export the necessary usb definitions:

commit 348748b0e8cccc675e2f3a1456460ffcd540e1a1
Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date:   Wed Jan 11 12:45:56 2012 +0100

    usb/uas: move UAS structs / defines into a header file

and:

commit 7ac4704c099125214a4f0a4bd54ce94d15be2ffb
Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date:   Sat Feb 25 18:28:09 2012 +0100

    usb/storage: a couple defines from drivers/usb/storage/transport.h to include/linux/usb/storage.h

Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
qla2xxx: Address minor v3.4-rc build breakage

Update lio-core.git qla2xxx LLD code to address some minor build
breakages from the v3.4-rc2 merge to follow 8.03.07.13-k code that
had been fixed in target-pending.git/for-next-merge.

This includes the qla2x00_gid_list_size() conversion and update the
scsi_cmnd reference within qla2xxx_abort_fcport_cmds().

Cc: Arun Easi <arun.easi@qlogic.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
tcm_vhost: Convert to use mainline virtio_scsi.h

This patch converts tcm_vhost in lio-core.git to use mainline
virtio_scsi.h defines from v3.4-rc2.  This includes:

*) Rename virtio_scsi_cmd_header -> virtio_scsi_cmd_req
*) Rename virtio_scsi_footer -> virtio_scsi_cmd_resp
*) Convert vhost_scsi_handle_vq() use scsilun_to_int() from v_req->lun[8]

So for this has been compile tested only, but the changes look
reasonably straight-forward.  Please have a look Stefan & Co..

Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Cc: Cong Meng <mengcong@cn.ibm.com>
Cc: Zhi Yong Wu <wuzhy@cn.ibm.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core
firewire-sbp-target: Add ORB address to sbp_handle_command debug message
firewire-sbp-target: add 'ignoring DOORBELL' debug message
firewire-sbp-target: fold sbp_rw_data_continue() into sbp_rw_data()
firewire-sbp-target: avoid sg_copy_(to|from)_buffer