On Sat, 2012-12-15 at 14:28 -0800, Linus Torvalds wrote:
> On Fri, Dec 14, 2012 at 3:53 PM, Nicholas A. Bellinger
> <nab@xxxxxxxxxxxxxxx> wrote:
> >
> > Here are the target updates for v3.8-rc1 merge window code. Please go
> > ahead and pull from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next
> >
> > Just a heads up that there is a minor merge conflict that you'll
> > encounter in target_handle_task_attr() code, that sfr has been carrying
> > a fix for recently within -next. After dropping the HEAD section, the
> > resolution should look like:
>
> Hmm. This is *not* how I resolved that conflict - that seems to drop the new
>
> complete(&cmd->t_transport_stop_comp);
>
> added by Roland in commit 3ea160b3e8f0 ("target: Fix handling of
> aborted commands").
You are most certainly correct.
>
> So my conflict resolution looks different.
>
> Which may be a bug, of course. Nicholas, Roland, please check my end result,
>
Including the complete() from commit 3ea160b3e8f0 in the exception path
for transport_check_aborted_status() within target_execute_cmd() code
was/is the proper merge resolution.
Thank you for taking care of this.
--nab
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
