Ah, so the answer is that mmap-alloc and memfd conflict. But if you order the files alphabetically they probably also conflict... :-) so separating the changes in two patches would not have helped.
Michael is handling both patches so I guess he can resolve the conflict too. Paolo -----Original Message----- From: Marc-André Lureau [marcandre.lur...@gmail.com] Received: venerdì, 02 ott 2015, 20:26 To: Paolo Bonzini [pbonz...@redhat.com] CC: Michael S. Tsirkin [m...@redhat.com]; Thibaut Collet [thibaut.col...@6wind.com]; Jason Wang [jasow...@redhat.com]; QEMU [qemu-devel@nongnu.org]; Linhaifeng [haifeng....@huawei.com] Subject: Re: [Qemu-devel] [PATCH v7 03/24] util: add linux-only memfd fallback On Fri, Oct 2, 2015 at 5:57 PM, Paolo Bonzini <pbonz...@redhat.com> wrote: >> Will be easier to apply if this refactoring is a separate patch. > > Is someone doing anything conflicting in this area? (My answer: not > that I know of). so you mean that splitting over several lines isn't useful? The main reason I did it is because the line started to be long, that compatfd.o was already a seperate line, and that mmap-alloc patch actually conflicted with memfd. If it's not worth it, I guess I will just add a line below compat.o -- Marc-André Lureau
