On 23 October 2014 07:33, Michael Tokarev <m...@tls.msk.ru> wrote: > On 09/22/2014 11:34 AM, Michael Tokarev wrote: >> 22.09.2014 10:23, Markus Armbruster wrote: >>> Michael Tokarev <m...@tls.msk.ru> writes: >>> >>>> Applied to -trivial, thank you! >>> >>> Makes my 'hmp: Remove "info pcmcia"' conflict. Either revert this one >>> before applying mine, or resolve the conflict and drop the paragraph >>> about the bug from my commit message. >> >> Okay, I'll keep an eye on this -- I'm reverting the trivial patch >> for now. > > So it looks like the original patch by zhanghailiang still applies, > and your patch, `info pcmcia' removal, hasn't been applied for over > a month. Should I apply the bugfix by zhanghailiang finally?
The 'remove info pcmcia' patch is in target-arm.next: https://git.linaro.org/people/peter.maydell/qemu-arm.git/shortlog/refs/heads/target-arm.next it's just that pressure of other stuff plus KVM Forum means I haven't yet had a chance to scan for other ARM things to pick up and flush the queue yet. I'll try to do that this week. thanks -- PMM
