There were quite a few BPF conflicts during the merge I just did of 'net' into 'net-next'.
In particular, all of the packet pointer branch tests in the verifier had to be resolved wrt. three different sets of changes. The off-by-one stuff. The allowance of the 'data_end > ptr + x' form of packet pointer checks. And finally, the metadata stuff. I would really appreciate an audit and double check of my merge work by the interested parties. Thank you.
