From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>,
kvm@vger•kernel.org, Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Hildenbrand <dahi@linux•vnet.ibm.com>
Subject: linux-next: manual merge of the kvm tree with the s390 tree
Date: Thu, 14 Jul 2016 14:03:34 +1000 [thread overview]
Message-ID: <20160714140334.7009275f@canb.auug.org.au> (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
next reply other threads:[~2016-07-14 4:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-14 4:03 Stephen Rothwell [this message]
2016-07-14 6:58 ` linux-next: manual merge of the kvm tree with the s390 tree David Hildenbrand
-- strict thread matches above, loose matches on Subject: below --
2020-05-29 6:46 Stephen Rothwell
2020-06-04 3:05 ` Stephen Rothwell
2016-06-29 4:36 Stephen Rothwell
2016-06-29 5:47 ` Heiko Carstens
2014-10-07 4:59 Stephen Rothwell
2013-06-06 3:55 Stephen Rothwell
2013-01-03 1:06 Stephen Rothwell
2013-01-03 7:31 ` Martin Schwidefsky
2013-01-03 10:56 ` Stephen Rothwell
2012-08-16 3:49 Stephen Rothwell
2011-09-21 3:55 Stephen Rothwell
2010-10-21 1:16 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160714140334.7009275f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dahi@linux$(echo .)vnet.ibm.com \
--cc=gleb@kernel$(echo .)org \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mtosatti@redhat$(echo .)com \
--cc=schwidefsky@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox