On Tue, Aug 2, 2016 at 5:36 PM, Martin Schwidefsky <schwidef...@de.ibm.com> wrote: > > I included my try to fixup the expected merge conflict between the > KVM tree and the s390 tree at the end of the first please-merge email > for s390.
Heh. It's "out of sight, out of mind". Once I've pulled something, I usually don't have the mental bandwidth to remember details from previous merge requests during the merge window. There's just too many of them. > Dunno if you have noticed this, the merge result looks good > to me. Thanks, Linus