lkml.org 
[lkml]   [2017]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the target-bva tree with the target-updates tree
Hi all,

On Fri, 2 Jun 2017 14:05:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the target-bva tree got a conflict in:
>
> drivers/target/target_core_tpg.c
>
> between commits:
>
> 06fd91ce633d ("target/configfs: Kill se_lun->lun_link_magic")
> 4f61e1e687c4 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
>
> from the target-updates tree and commits:
>
> ba438d7c8d39 ("target: Avoid target_shutdown_sessions loop during queue_depth change")
> b968ec8ff101 ("target/configfs: Kill se_lun->lun_link_magic")
>
> from the target-bva tree.
>
> I fixed it up (I used the version from the target-updates tree) and can

Which turned out to be the wrong thing to do (or more was needed) as
the result does not build :-(.

I have just dropped the target-bva tree for today.
--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2017-06-05 00:07    [W:0.358 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site