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? Thanks, /mjt
