I just merged net into net-next and one of the conflicts had to do with the truesize bug fix in 'net' conflicting with the changes in 'net-next' which encode the headroom into the contexts for mergeable buffers.
I did my best to resolve this, but if you two would take a closer look and test out the result I would really appreciate it! Thanks.
