lkml.org 
[lkml]   [2012]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] target updates for v3.8-rc1
On Fri, Dec 14, 2012 at 3:53 PM, Nicholas A. Bellinger
<nab@linux-iscsi.org> 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").

So my conflict resolution looks different.

Which may be a bug, of course. Nicholas, Roland, please check my end result,

Linus


\
 
 \ /
  Last update: 2012-12-16 00:01    [W:0.038 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site