From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org, kvm-ppc@vger.kernel.org
Subject: Re: [GIT PULL] Please pull my kvm-ppc-next branch
Date: Tue, 06 Dec 2016 13:50:46 +0000 [thread overview]
Message-ID: <20161206135046.GD7972@potion> (raw)
In-Reply-To: <20161206093544.GB25458@fergus.ozlabs.ibm.com>
2016-12-06 20:35+1100, Paul Mackerras:
> Hi Paolo or Radim,
>
> Please do another pull from my kvm-ppc-next branch, to get one more
> commit for 4.10. This should eliminate a merge conflict with
> upstream. Since 4.9-rc5, a commit (9e5f68842276) has gone upstream
> which conflicts with commit ebe4535fbe7a in my tree, which has already
> gone into kvm/next. The conflict is just lines added in the same
> place, but it would be better to have the prototypes added by
> ebe4535fbe7a in KVM-related headers anyway, since they are for KVM
> functions. The new commit moves the prototypes to asm/kvm_ppc.h.
> This has been in linux-next for a couple of days.
Pulled, thanks.
WARNING: multiple messages have this Message-ID (diff)
From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org, kvm-ppc@vger.kernel.org
Subject: Re: [GIT PULL] Please pull my kvm-ppc-next branch
Date: Tue, 6 Dec 2016 14:50:46 +0100 [thread overview]
Message-ID: <20161206135046.GD7972@potion> (raw)
In-Reply-To: <20161206093544.GB25458@fergus.ozlabs.ibm.com>
2016-12-06 20:35+1100, Paul Mackerras:
> Hi Paolo or Radim,
>
> Please do another pull from my kvm-ppc-next branch, to get one more
> commit for 4.10. This should eliminate a merge conflict with
> upstream. Since 4.9-rc5, a commit (9e5f68842276) has gone upstream
> which conflicts with commit ebe4535fbe7a in my tree, which has already
> gone into kvm/next. The conflict is just lines added in the same
> place, but it would be better to have the prototypes added by
> ebe4535fbe7a in KVM-related headers anyway, since they are for KVM
> functions. The new commit moves the prototypes to asm/kvm_ppc.h.
> This has been in linux-next for a couple of days.
Pulled, thanks.
next prev parent reply other threads:[~2016-12-06 13:50 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-05 7:45 [GIT PULL] Please pull my kvm-ppc-next branch Paul Mackerras
2015-09-05 7:45 ` Paul Mackerras
2015-09-07 8:29 ` Paolo Bonzini
2015-09-07 8:29 ` Paolo Bonzini
2015-10-26 4:17 ` Paul Mackerras
2015-10-26 4:17 ` Paul Mackerras
2015-11-02 12:53 ` Paolo Bonzini
2015-11-02 12:53 ` Paolo Bonzini
2016-01-15 10:35 ` Paul Mackerras
2016-01-15 10:35 ` Paul Mackerras
2016-01-15 16:49 ` Paolo Bonzini
2016-01-15 16:49 ` Paolo Bonzini
2016-03-03 2:38 ` Paul Mackerras
2016-03-03 2:38 ` Paul Mackerras
2016-03-03 13:46 ` Paolo Bonzini
2016-03-03 13:46 ` Paolo Bonzini
2016-05-13 5:23 ` Paul Mackerras
2016-05-13 5:23 ` Paul Mackerras
2016-05-13 7:44 ` Christian Borntraeger
2016-05-13 7:44 ` Christian Borntraeger
2016-05-13 8:24 ` Paul Mackerras
2016-05-13 8:24 ` Paul Mackerras
2016-07-11 15:46 ` Paul Mackerras
2016-07-11 15:46 ` Paul Mackerras
2016-07-11 16:11 ` Paolo Bonzini
2016-07-11 16:11 ` Paolo Bonzini
2016-09-13 4:58 ` Paul Mackerras
2016-09-13 4:58 ` Paul Mackerras
2016-09-13 13:10 ` Paolo Bonzini
2016-09-13 13:10 ` Paolo Bonzini
2016-09-28 4:46 ` Paul Mackerras
2016-09-28 4:46 ` Paul Mackerras
2016-09-29 14:46 ` Radim Krčmář
2016-09-29 14:46 ` Radim Krčmář
2016-09-29 20:00 ` Thomas Huth
2016-09-29 20:00 ` Thomas Huth
2016-11-28 22:53 ` Paul Mackerras
2016-11-28 22:53 ` Paul Mackerras
2016-11-30 17:25 ` Radim Krčmář
2016-11-30 17:25 ` Radim Krčmář
2016-12-06 9:35 ` Paul Mackerras
2016-12-06 9:35 ` Paul Mackerras
2016-12-06 13:50 ` Radim Krčmář [this message]
2016-12-06 13:50 ` Radim Krčmář
2017-02-01 9:24 ` Paul Mackerras
2017-02-01 9:24 ` Paul Mackerras
2017-02-07 17:17 ` Paolo Bonzini
2017-02-07 17:17 ` Paolo Bonzini
2017-04-19 11:01 ` Paul Mackerras
2017-04-19 11:01 ` Paul Mackerras
2017-04-19 12:32 ` Alexey Kardashevskiy
2017-04-19 12:32 ` Alexey Kardashevskiy
2017-04-20 1:28 ` Paul Mackerras
2017-04-20 1:28 ` Paul Mackerras
2017-04-21 7:52 ` Paul Mackerras
2017-04-21 7:52 ` Paul Mackerras
2017-04-21 10:28 ` Paolo Bonzini
2017-04-21 10:28 ` Paolo Bonzini
2017-04-29 0:25 ` [GIT PULL] Please pull my kvm-ppc-next branch again Paul Mackerras
2017-04-29 0:25 ` Paul Mackerras
2017-04-29 12:39 ` Paolo Bonzini
2017-04-29 12:39 ` Paolo Bonzini
2017-05-06 10:02 ` Paul Mackerras
2017-05-06 10:02 ` Paul Mackerras
2017-05-06 15:22 ` Paolo Bonzini
2017-05-06 15:22 ` Paolo Bonzini
2017-05-08 3:31 ` Paul Mackerras
2017-05-08 3:31 ` Paul Mackerras
2017-05-08 7:28 ` Paolo Bonzini
2017-05-08 7:28 ` Paolo Bonzini
2017-05-08 13:39 ` Paolo Bonzini
2017-05-08 13:39 ` Paolo Bonzini
2017-05-09 1:09 ` Paul Mackerras
2017-05-09 1:09 ` Paul Mackerras
2017-05-09 2:03 ` Michael Ellerman
2017-05-09 2:03 ` Michael Ellerman
2017-05-09 2:17 ` Linus Torvalds
2017-05-09 2:17 ` Linus Torvalds
2017-05-09 9:24 ` Paolo Bonzini
2017-05-09 9:24 ` Paolo Bonzini
2017-05-09 13:31 ` Benjamin Herrenschmidt
2017-05-09 13:31 ` Benjamin Herrenschmidt
2017-05-09 13:53 ` Paolo Bonzini
2017-05-09 13:53 ` Paolo Bonzini
2017-05-11 6:33 ` Michael Ellerman
2017-05-11 6:33 ` Michael Ellerman
2017-05-09 23:31 ` Paul Mackerras
2017-05-09 23:31 ` Paul Mackerras
2017-05-11 6:28 ` Michael Ellerman
2017-05-11 6:28 ` Michael Ellerman
2017-05-11 6:37 ` Michael Ellerman
2017-05-11 6:37 ` Michael Ellerman
2017-07-02 7:11 ` [GIT PULL] Please pull my kvm-ppc-next branch Paul Mackerras
2017-07-02 7:11 ` Paul Mackerras
2017-09-01 6:36 ` Paul Mackerras
2017-09-01 6:36 ` Paul Mackerras
2017-11-02 6:54 ` Paul Mackerras
2017-11-02 6:54 ` Paul Mackerras
2017-11-02 17:16 ` Paolo Bonzini
2017-11-02 17:16 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2017-02-19 23:25 Paul Mackerras
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=20161206135046.GD7972@potion \
--to=rkrcmar@redhat.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=paulus@ozlabs.org \
--cc=pbonzini@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.