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: Thu, 26 Nov 2015 01:16:14 +0100 From: Daniel Borkmann <daniel@...earbox.net> To: Stephen Rothwell <sfr@...b.auug.org.au>, David Miller <davem@...emloft.net>, netdev@...r.kernel.org CC: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the net tree On 11/26/2015 01:01 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > kernel/bpf/syscall.c > > between commit: > > c9da161c6517 ("bpf: fix clearing on persistent program array maps") > > from the net tree and commit: > > f99bf205dab0 ("bpf: add show_fdinfo handler for maps") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Seems fine, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists