netdev - Re: pull-request: bpf-next 2019-07-03

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 04 Jul 2019 13:49:40 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     daniel@...earbox.net
Cc:     ast@...nel.org, saeedm@...lanox.com, netdev@...r.kernel.org,
        bpf@...r.kernel.org
Subject: Re: pull-request: bpf-next 2019-07-03

From: Daniel Borkmann <daniel@...earbox.net>
Date: Thu,  4 Jul 2019 00:47:40 +0200

> The following pull-request contains BPF updates for your *net-next* tree.
> 
> There is a minor merge conflict in mlx5 due to 8960b38932be ("linux/dim:
> Rename externally used net_dim members") which has been pulled into your
> tree in the meantime, but resolution seems not that bad ... getting current
> bpf-next out now before there's coming more on mlx5. ;) I'm Cc'ing Saeed
> just so he's aware of the resolution below:
 ...

Thanks for the detailed merge resolution guidance, it helps a lot.

> Let me know if you run into any issues. Anyway, the main changes are:
 ...
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

Pulled.