From: Linus Torvalds Date: Sat, 17 Sep 2011 23:52:13 +0000 (-0700) Subject: Merge branch '3.1-rc-fixes' of git://linux-iscsi.org/target-pending X-Git-Tag: Ubuntu-5.2.0-15.16~19642 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4be0ed42c56c84d980a851f0bdd0fc20b45c3944;p=mirror_ubuntu-eoan-kernel.git Merge branch '3.1-rc-fixes' of git://linux-iscsi.org/target-pending * '3.1-rc-fixes' of git://linux-iscsi.org/target-pending: iscsi-target: Fix sendpage breakage with proper padding+DataDigest iovec offsets iscsi-target: Disable markers + remove dangerous local scope array usage target: Skip non hex characters for VPD=0x83 NAA IEEE Registered Extended tcm_fc: Work queue based approach instead of managing own thread and event based mechanism tcm_fc: Invalidation of DDP context for FCoE target in error conditions target: Fix race between multiple invocations of target_qf_do_work() --- 4be0ed42c56c84d980a851f0bdd0fc20b45c3944