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
| ||
|
Date: Mon, 15 Aug 2016 09:51:59 +0200 From: Daniel Borkmann <daniel@...earbox.net> To: Stephen Rothwell <sfr@...b.auug.org.au>, David Miller <davem@...emloft.net>, Networking <netdev@...r.kernel.org> CC: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Sargun Dhillon <sargun@...gun.me> Subject: Re: linux-next: manual merge of the net-next tree with the net tree On 08/15/2016 02:35 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > kernel/bpf/verifier.c > > between commit: > > 747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming") > > from the net tree and commit: > > 60d20f9195b2 ("bpf: Add bpf_current_task_under_cgroup helper") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary. Looks good to me, thanks!
Powered by blists - more mailing lists