None

is not in the TLV table and this explains why we end up here. It might be a good opportunity to see what else we are missing.

BTW, the output of the patch is in git format, so I think that you can apply it with git am. It's the inner patch (which is contained inside this patch) that it's in svn format 8-).

Yes, I am talking about git am -3 for the inner part as this (wireshark svn) is the place where having a three way merge is going to be the most useful thing to do. :)