Am 20.06.2013 um 07:10 schrieb Michael Tokarev <m...@tls.msk.ru>:
> 20.06.2013 01:40, Alexander Graf wrote: >> >> On 19.06.2013, at 23:08, Stefan Weil wrote: >> >>> This kind of type cast must use uintptr_t or target_ulong to be portable >>> for hosts with sizeof(void *) != sizeof(long). >>> >>> Here the value is assigned to a variable of type target_ulong. >>> >>> Signed-off-by: Stefan Weil <s...@weilnetz.de> >> >> Acked-by: Alexander Graf <ag...@suse.de> >> >> I suppose this one goes through the trivial tree? > > Anything which goes to -trivial can be applied directly or > into some other subsystem tree first. When I send a pull > request I rebase trivial tree ontop of current master and > filter out anything which has been already applied, so that's > not an issue. The only possible issue is when you applied > it to some other tree, and -trivial pull request were handled > before that other tree - how that will be handled by git? > > Will it complain (so that the situation should be resolved > manually), will it apply nothing or will it appy an empty > patch? (the patch signature will be different, with > different S-o-b.) I think I've seen empty commits before > in qemu tree, with the same subject/author as some previous > commit. It depends on how you handle the tree. I rebase ppc-next too, so the commit would simply vanish. I'll apply it to ppc-next as well then. Alex
