On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote: > > Could you please look into this and send me a new pull request with > the conflicts resolved? > Sure, will do (tomorrow, we have a holiday today). Would you prefer I send you the merge resolution for your tree, or just pull in net for a new pull request? johannes
