Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1655887 > unrolled thread

linux-next: manual merge of the target-bva tree with the target-updates tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the target-bva tree with the  target-updates tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-02 06:10 +0200
    Re: linux-next: manual merge of the target-bva tree with the  target-updates tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-02 06:20 +0200

#1655887 — linux-next: manual merge of the target-bva tree with the target-updates tree

Hi Bart,

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
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]

#1655891

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web