qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* Hi Bonzini, I've seen your 3.1 branch have conflict with qemu.org/master
@ 2020-09-20 14:53 罗勇刚(Yonggang Luo)
  2020-09-20 16:43 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-09-20 14:53 UTC (permalink / raw)
  To: Paolo Bonzini, qemu-level

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

I rebased 3.1 branch on  qemu.org/master and placed at
https://github.com/lygstate/qemu/tree/for-3.1

And removed two conflcit revision

* iotests: Work around failing readlink -f
* Simplify the .gitignore file

And test result at here:
https://cirrus-ci.com/build/4717093432066048

-- 
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[-- Attachment #2: Type: text/html, Size: 757 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-20 16:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-20 14:53 Hi Bonzini, I've seen your 3.1 branch have conflict with qemu.org/master 罗勇刚(Yonggang Luo)
2020-09-20 16:43 ` Paolo Bonzini

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).