From: Michael Ellerman <mpe@ellerman•id.au>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>, KVM <kvm@vger•kernel.org>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Paul Mackerras <paulus@ozlabs•org>,
Li Zhong <zhong@linux•vnet.ibm.com>
Subject: Re: linux-next: manual merge of the kvm tree with the powerpc tree
Date: Wed, 15 Feb 2017 21:52:08 +1100 [thread overview]
Message-ID: <878tp7lo9z.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20170215133820.439190c9@canb.auug.org.au>
Stephen Rothwell <sfr@canb•auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/powerpc/kvm/book3s_hv_rm_xics.c
>
> between commit:
>
> ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
>
> from the powerpc tree and commit:
>
> 21acd0e4df04 ("KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend")
>
> from the kvm tree.
Thanks.
That will go away if/when Paolo merges the rest of Paul's next.
cheers
> diff --cc arch/powerpc/kvm/book3s_hv_rm_xics.c
> index 29f43ed6d5eb,0b2e388f4cdf..000000000000
> --- a/arch/powerpc/kvm/book3s_hv_rm_xics.c
> +++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
> @@@ -35,8 -35,8 +35,8 @@@ int kvm_irq_bypass = 1
> EXPORT_SYMBOL(kvm_irq_bypass);
>
> static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,
> - u32 new_irq);
> + u32 new_irq, bool check_resend);
> -static int xics_opal_rm_set_server(unsigned int hw_irq, int server_cpu);
> +static int xics_opal_set_server(unsigned int hw_irq, int server_cpu);
>
> /* -- ICS routines -- */
> static void ics_rm_check_resend(struct kvmppc_xics *xics,
next prev parent reply other threads:[~2017-02-15 10:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 2:38 linux-next: manual merge of the kvm tree with the powerpc tree Stephen Rothwell
2017-02-15 10:52 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-22 5:25 Stephen Rothwell
2021-06-22 6:23 ` Paolo Bonzini
2021-06-22 14:51 ` Michael Ellerman
2021-06-22 16:52 ` Paolo Bonzini
2018-12-21 5:16 Stephen Rothwell
2017-02-14 3:20 Stephen Rothwell
2017-02-14 3:16 Stephen Rothwell
2017-02-14 3:12 Stephen Rothwell
2017-02-10 3:59 Stephen Rothwell
2017-02-10 10:06 ` Paolo Bonzini
2017-02-14 8:45 ` Michael Ellerman
2017-02-14 13:34 ` Paolo Bonzini
2017-02-15 11:16 ` Michael Ellerman
2017-02-15 11:28 ` Paolo Bonzini
2017-02-10 3:47 Stephen Rothwell
2016-07-21 4:37 Stephen Rothwell
2016-07-18 5:55 Stephen Rothwell
2016-07-18 5:54 Stephen Rothwell
2016-03-04 4:30 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=878tp7lo9z.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=gleb@kernel$(echo .)org \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mtosatti@redhat$(echo .)com \
--cc=paulus@ozlabs$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=zhong@linux$(echo .)vnet.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