linux-next: manual merge of the kvm tree with the s390 tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the kvm tree with the s390 tree
Date	2016-07-14 06:10 +0200
Message-ID	<rUG8h-4ua-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi all,

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

  arch/s390/mm/gmap.c

between commit:

  f04540298440 ("s390/mm: fix gmap tlb flush issues")

from the s390 tree and commit:

  6ea427bbbd40 ("s390/mm: add reference counter to gmap structure")

from the kvm tree.

I fixed it up (I just assumed that the update to gmap_free is no longer
needed) 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 kvm tree with the s390 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-14 06:10 +0200
  Re: linux-next: manual merge of the kvm tree with the s390 tree David Hildenbrand <dahi@linux.vnet.ibm.com> - 2016-07-14 09:00 +0200

csiph-web