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

Groups > linux.kernel > #1646500

linux-next: manual merge of the tip tree with Linus' tree

Show all headers | View raw

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/arm64/include/asm/cpufeature.h

between commit:

  63a1e1c95e60 ("arm64/cpufeature: don't use mutex in bringup path")

from Linus' tree and commit:

  d54bb72551b9 ("arm64/cpufeature: Use static_branch_enable_cpuslocked()")

from the tip tree.

I have no idea what the correct resolution is here, so I have just gone
with the former for now (i.e. removed the
static_branch_enable_cpuslocked() call).  This will probably need a
better (or even correct :-)) fix.

I fixed it up (see above) 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tip tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-22 05:40 +0200
  Re: linux-next: manual merge of the tip tree with Linus' tree Mark Rutland <mark.rutland@arm.com> - 2017-05-22 10:40 +0200
    Re: linux-next: manual merge of the tip tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-22 23:50 +0200
      Re: linux-next: manual merge of the tip tree with Linus' tree Mark Rutland <mark.rutland@arm.com> - 2017-05-23 10:40 +0200

csiph-web