Re: Please merge net into net-next

2017-08-01 Thread David Miller
From: Edward Cree Date: Mon, 31 Jul 2017 18:25:16 +0100 > Could you please merge net into net-next, so I can rebase my BPF patches? > Otherwise there's likely to be merge conflicts with the BPF_SUB fix. This has now been done.

Re: Please merge net into net-next

2017-07-31 Thread David Miller
From: Edward Cree Date: Mon, 31 Jul 2017 18:25:16 +0100 > Could you please merge net into net-next, so I can rebase my BPF patches? > Otherwise there's likely to be merge conflicts with the BPF_SUB fix. I'll do this soon.