* Please merge net into net-next @ 2017-07-31 17:25 Edward Cree 2017-07-31 17:51 ` David Miller 2017-08-01 22:08 ` David Miller 0 siblings, 2 replies; 3+ messages in thread From: Edward Cree @ 2017-07-31 17:25 UTC (permalink / raw) To: David Miller; +Cc: netdev Hi Dave, 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. Thanks, -Ed ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Please merge net into net-next 2017-07-31 17:25 Please merge net into net-next Edward Cree @ 2017-07-31 17:51 ` David Miller 2017-08-01 22:08 ` David Miller 1 sibling, 0 replies; 3+ messages in thread From: David Miller @ 2017-07-31 17:51 UTC (permalink / raw) To: ecree; +Cc: netdev From: Edward Cree <ecree@solarflare.com> 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. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Please merge net into net-next 2017-07-31 17:25 Please merge net into net-next Edward Cree 2017-07-31 17:51 ` David Miller @ 2017-08-01 22:08 ` David Miller 1 sibling, 0 replies; 3+ messages in thread From: David Miller @ 2017-08-01 22:08 UTC (permalink / raw) To: ecree; +Cc: netdev From: Edward Cree <ecree@solarflare.com> 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. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-01 22:08 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-07-31 17:25 Please merge net into net-next Edward Cree 2017-07-31 17:51 ` David Miller 2017-08-01 22:08 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).