From: Linus Torvalds Date: Thu, 19 Jul 2012 01:40:38 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending X-Git-Tag: v3.5~12 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=8a7298b7805ab55dea674a8aba97cf2eac20dca8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending Pull target fixes from Nicholas Bellinger: "This includes a bugfix from MDR to address a NULL pointer OOPs with FCoE aborts, along with a WRITE_SAME emulation bugfix for NOLB=0 cases, and persistent reservation return cleanups from Roland. All three patches are CC'ed to stable." * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: Fix range calculation in WRITE SAME emulation when num blocks == 0 target: Clean up returning errors in PR handling code tcm_fc: Fix crash seen with aborts and large reads --- 8a7298b7805ab55dea674a8aba97cf2eac20dca8