[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvi
|
From: |
Markus Armbruster |
|
Subject: |
Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense |
|
Date: |
Tue, 18 Feb 2014 16:32:31 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) |
Quick experiment to gauge the likelihood of conflicts: I reran
coccinelle on v1.7.0, then attempted to merge the result into master. I
got *two* conflicts. I backed out with "git-merge --abort", then merged
with "git-merge -s recursive -X ours g_new.old" to drop both conflicting
hunks, and the result is just fine.
Peter, would you be willing to honor a pull request?
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Markus Armbruster, 2014/02/03
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Peter Maydell, 2014/02/03
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Markus Armbruster, 2014/02/04
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Markus Armbruster, 2014/02/13
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Peter Maydell, 2014/02/13
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Markus Armbruster, 2014/02/13
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense,
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Peter Maydell, 2014/02/21
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Markus Armbruster, 2014/02/21
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Peter Maydell, 2014/02/21
- Re: [Qemu-devel] [PATCH 0/2] Use g_new() & friends where that makes obvious sense, Markus Armbruster, 2014/02/21