| Message ID | 1400039557-32369-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote: > > Resending: same as previous pull request but with numbers in the subject. > Sorry about the noise. > > > The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88: > > Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream > > for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b: > > virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300) My apply-pullreq script complains: merge: remotes/mst/for_upstream - not something we can merge did you mean "tags/for_upstream" ? thanks -- PMM
On Thu, May 15, 2014 at 05:32:05PM +0100, Peter Maydell wrote: > On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > Resending: same as previous pull request but with numbers in the subject. > > Sorry about the noise. > > > > > > The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88: > > > > Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100) > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream > > > > for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b: > > > > virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300) > > My apply-pullreq script complains: > merge: remotes/mst/for_upstream - not something we can merge > > did you mean "tags/for_upstream" ? > > thanks > -- PMM Yes: git used to get this right but it looks like it's broken in git master. hashes match and it's signed properly ... want me to resend?
On 15 May 2014 17:33, Michael S. Tsirkin <mst@redhat.com> wrote: > On Thu, May 15, 2014 at 05:32:05PM +0100, Peter Maydell wrote: >> On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote: >> > >> > Resending: same as previous pull request but with numbers in the subject. >> > Sorry about the noise. >> > >> > >> > The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88: >> > >> > Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100) >> > >> > are available in the git repository at: >> > >> > >> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream >> > >> > for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b: >> > >> > virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300) >> >> My apply-pullreq script complains: >> merge: remotes/mst/for_upstream - not something we can merge >> >> did you mean "tags/for_upstream" ? >> >> thanks >> -- PMM > > Yes: git used to get this right but it looks like it's broken in git > master. > hashes match and it's signed properly ... > want me to resend? That's OK, I just wanted to check the tag name. (I notice this kind of mismatch because I just copy-paste the url-and-branchname onto my commandline. Also if we were ever to implement some kind of automatic testing of pull-request-emails the automated script would notice :-)) Applied, thanks. -- PMM
On Thu, May 15, 2014 at 06:35:05PM +0100, Peter Maydell wrote: > On 15 May 2014 17:33, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Thu, May 15, 2014 at 05:32:05PM +0100, Peter Maydell wrote: > >> On 14 May 2014 04:53, Michael S. Tsirkin <mst@redhat.com> wrote: > >> > > >> > Resending: same as previous pull request but with numbers in the subject. > >> > Sorry about the noise. > >> > > >> > > >> > The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88: > >> > > >> > Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100) > >> > > >> > are available in the git repository at: > >> > > >> > > >> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream > >> > > >> > for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b: > >> > > >> > virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300) > >> > >> My apply-pullreq script complains: > >> merge: remotes/mst/for_upstream - not something we can merge > >> > >> did you mean "tags/for_upstream" ? > >> > >> thanks > >> -- PMM > > > > Yes: git used to get this right but it looks like it's broken in git > > master. > > hashes match and it's signed properly ... > > want me to resend? > > That's OK, I just wanted to check the tag name. (I notice this > kind of mismatch because I just copy-paste the url-and-branchname > onto my commandline. Also if we were ever to implement some kind > of automatic testing of pull-request-emails the automated script > would notice :-)) > > Applied, thanks. > > -- PMM Note for git 2.0 users (once that's out): you must use tags/<name> for your pull requests, otherwise people using older clients will fail to pull from you.
Resending: same as previous pull request but with numbers in the subject. Sorry about the noise. The following changes since commit 06b4f00d53637f2c16a62c2cbaa30bffb045cf88: Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-09 15:46:34 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git for_upstream for you to fetch changes up to 937251408051e0489f78e4db3c92e045b147b38b: virtio: allow mapping up to max queue size (2014-05-12 12:07:21 +0300) ---------------------------------------------------------------- virtio update looks like a quiet week minor bugfix in virtio by myself Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Michael S. Tsirkin (1): virtio: allow mapping up to max queue size hw/virtio/virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)