8 Dec
2015
8 Dec
'15
4:41 p.m.
On Tue, Dec 08, 2015 at 02:42:05PM +0800, Alex Shi wrote:
Thanks David and Mark!
I merged the pan 4.1 branch into lsk. the following is conflict solution. Could you like review it?
I think that's right, but let me just rebase my patch on v4.1.13, and it should merge without conflict. I'll send another pull request later today, after I do some additional testing.
David