From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc: Mark Brown <broonie@kernel.org>,
David Gibson <david@gibson.dropbear.id.au>,
Greg Kurz <groug@kaod.org>, Thomas Huth <thuth@redhat.com>,
Paul Mackerras <paulus@ozlabs.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the powerpc tree with Linus' tree
Date: Mon, 13 Nov 2017 16:37:06 +1100 [thread overview]
Message-ID: <20171113163706.6c5a98a1@canb.auug.org.au> (raw)
In-Reply-To: <20171030125133.ce5vb6z67dqjb7oj@sirena.co.uk>
Hi all,
On Mon, 30 Oct 2017 12:51:33 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/kvm/powerpc.c
>
> between commit:
>
> ac64115a66c1 ("KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM")
>
> from Linus' tree and commit:
>
> 2a3d6553cbd7 ("KVM: PPC: Tie KVM_CAP_PPC_HTM to the user-visible TM feature")
>
> from the powerpc tree.
>
> I fixed it up (see below) 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.
>
> diff --cc arch/powerpc/kvm/powerpc.c
> index ee279c7f4802,a3746b98ec11..000000000000
> --- a/arch/powerpc/kvm/powerpc.c
> +++ b/arch/powerpc/kvm/powerpc.c
> @@@ -644,7 -644,8 +644,8 @@@ int kvm_vm_ioctl_check_extension(struc
> break;
> #endif
> case KVM_CAP_PPC_HTM:
> - r = cpu_has_feature(CPU_FTR_TM_COMP) && hv_enabled;
> - r = is_kvmppc_hv_enabled(kvm) &&
> ++ r = hv_enabled &&
> + (cur_cpu_spec->cpu_user_features2 & PPC_FEATURE2_HTM_COMP);
> break;
> default:
> r = 0;
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-11-13 5:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 12:51 linux-next: manual merge of the powerpc tree with Linus' tree Mark Brown
2017-11-13 5:37 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-15 22:27 Stephen Rothwell
2018-08-14 23:19 Stephen Rothwell
2017-11-07 22:32 Stephen Rothwell
2017-02-16 22:06 Stephen Rothwell
2016-06-29 0:35 Stephen Rothwell
2016-06-29 5:24 ` Naveen N. Rao
2016-06-29 6:33 ` Michael Ellerman
2016-05-01 23:50 Stephen Rothwell
2014-05-29 2:04 Stephen Rothwell
2009-12-08 23:49 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=20171113163706.6c5a98a1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=broonie@kernel.org \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@ozlabs.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).