Re: [MERGE README] net --> net-next

2017-10-22 Thread David Miller
From: Daniel Borkmann Date: Sun, 22 Oct 2017 21:41:33 +0200 > On 10/22/2017 03:09 PM, Daniel Borkmann wrote: >> On 10/22/2017 02:57 PM, David Miller wrote: >>> >>> There were quite a few BPF conflicts during the merge I just did of >>> 'net' into 'net-next'. >>> >>> In

Re: [MERGE README] net --> net-next

2017-10-22 Thread Daniel Borkmann
On 10/22/2017 03:09 PM, Daniel Borkmann wrote: On 10/22/2017 02:57 PM, David Miller wrote: 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

Re: [MERGE README] net --> net-next

2017-10-22 Thread Daniel Borkmann
On 10/22/2017 02:57 PM, David Miller wrote: 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

[MERGE README] net --> net-next

2017-10-22 Thread David Miller
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