Message ID | 20200803235640.31210-1-daniel@iogearbox.net |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | pull-request: bpf-next 2020-08-04 | expand |
From: Daniel Borkmann <daniel@iogearbox.net> Date: Tue, 4 Aug 2020 01:56:40 +0200 > The following pull-request contains BPF updates for your *net-next* tree. Pulled, there was a minor conflict in net/core/dev.c please double check my work. Thank you!
On 8/4/20 3:45 AM, David Miller wrote: > From: Daniel Borkmann <daniel@iogearbox.net> > Date: Tue, 4 Aug 2020 01:56:40 +0200 > >> The following pull-request contains BPF updates for your *net-next* tree. > > Pulled, there was a minor conflict in net/core/dev.c please double check > my work. Right, I provided merge resolution / guidance in the PR for this, not sure if you saw it, but either way looks good to me, thanks!