All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paul Mackerras <paulus@ozlabs.org>,
	kvm@vger.kernel.org, kvm-ppc@vger.kernel.org
Subject: Re: [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.14-2 tag
Date: Thu, 09 Nov 2017 18:01:20 +0000	[thread overview]
Message-ID: <20171109180120.GA15561@flask> (raw)
In-Reply-To: <8e898f31-f0b2-e30f-594e-aee46e943a4d@redhat.com>

2017-11-09 10:46+0100, Paolo Bonzini:
> On 09/11/2017 06:25, Paul Mackerras wrote:
> >> Could you
> >> redo the fix on top of an older tag (e.g. on top of 4.14-rc3), and then:
> >>
> >> - I pull the fix from you for 4.14
> >>
> >> - you pull the fix yourself into kvm-ppc-next, and fix the conflicts?
> > My kvm-ppc-fixes branch is based directly on 4.14-rc4, which is prior
> > to the changes in the kvm next branch and my kvm-ppc-next branch, so I
> > don't see that I need to redo the fix.
> > 
> > I have merged kvm-ppc-fixes into kvm-ppc-next, resolved the conflicts,
> > and then applied another cosmetic patch on top to make the result look
> > nicer (with no functional change in that patch).  Doing that merge
> > also resolved another conflict (in arch/powerpc/kvm/powerpc.c).
> > 
> > So please do the pull from the existing kvm-ppc-fixes-4.14-2 tag for
> > 4.14, and I'll send you a pull request for kvm-ppc-next.
> 
> Sounds good.  Radim is probably going to do the pull.

Pulled both and sending this one to Linus tomorrow, thanks.

WARNING: multiple messages have this Message-ID (diff)
From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paul Mackerras <paulus@ozlabs.org>,
	kvm@vger.kernel.org, kvm-ppc@vger.kernel.org
Subject: Re: [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.14-2 tag
Date: Thu, 9 Nov 2017 19:01:20 +0100	[thread overview]
Message-ID: <20171109180120.GA15561@flask> (raw)
In-Reply-To: <8e898f31-f0b2-e30f-594e-aee46e943a4d@redhat.com>

2017-11-09 10:46+0100, Paolo Bonzini:
> On 09/11/2017 06:25, Paul Mackerras wrote:
> >> Could you
> >> redo the fix on top of an older tag (e.g. on top of 4.14-rc3), and then:
> >>
> >> - I pull the fix from you for 4.14
> >>
> >> - you pull the fix yourself into kvm-ppc-next, and fix the conflicts?
> > My kvm-ppc-fixes branch is based directly on 4.14-rc4, which is prior
> > to the changes in the kvm next branch and my kvm-ppc-next branch, so I
> > don't see that I need to redo the fix.
> > 
> > I have merged kvm-ppc-fixes into kvm-ppc-next, resolved the conflicts,
> > and then applied another cosmetic patch on top to make the result look
> > nicer (with no functional change in that patch).  Doing that merge
> > also resolved another conflict (in arch/powerpc/kvm/powerpc.c).
> > 
> > So please do the pull from the existing kvm-ppc-fixes-4.14-2 tag for
> > 4.14, and I'll send you a pull request for kvm-ppc-next.
> 
> Sounds good.  Radim is probably going to do the pull.

Pulled both and sending this one to Linus tomorrow, thanks.

  reply	other threads:[~2017-11-09 18:01 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-08 11:03 [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.14-2 tag Paul Mackerras
2017-11-08 11:03 ` Paul Mackerras
2017-11-08 13:17 ` Paolo Bonzini
2017-11-08 13:17   ` Paolo Bonzini
2017-11-09  5:25   ` Paul Mackerras
2017-11-09  5:25     ` Paul Mackerras
2017-11-09  9:46     ` Paolo Bonzini
2017-11-09  9:46       ` Paolo Bonzini
2017-11-09 18:01       ` Radim Krčmář [this message]
2017-11-09 18:01         ` Radim Krčmář
2017-11-09 10:50 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-next-4.15-2 tag Paul Mackerras
2017-11-09 10:50   ` Paul Mackerras
2017-11-09 17:59   ` Radim Krčmář
2017-11-09 17:59     ` Radim Krčmář
2017-11-24 23:21 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.15-1 tag Paul Mackerras
2017-11-24 23:21   ` Paul Mackerras
2017-11-27 16:58   ` Paolo Bonzini
2017-11-27 16:58     ` Paolo Bonzini
2018-01-11  2:42 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.15-3 tag Paul Mackerras
2018-01-11  2:42   ` Paul Mackerras
2018-01-11 13:07   ` Paolo Bonzini
2018-01-11 13:07     ` Paolo Bonzini
2018-01-11  9:31 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-cve-4.15 tag Paul Mackerras
2018-01-11  9:31   ` Paul Mackerras
2018-01-11 10:51   ` Paolo Bonzini
2018-01-11 10:51     ` Paolo Bonzini
2018-01-11 22:15     ` Paul Mackerras
2018-01-11 22:15       ` Paul Mackerras
2018-01-12  9:28       ` Paolo Bonzini
2018-01-12  9:28         ` Paolo Bonzini

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=20171109180120.GA15561@flask \
    --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.