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: Tue, 07 Apr 2015 09:11:33 -0700 From: Alexei Starovoitov <ast@...mgrid.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, 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 tip tree with the net-next tree On 4/7/15 12:04 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > samples/bpf/Makefile between commit 91bc4822c3d6 ("tc: bpf: add > checksum helpers") from the net-next tree and commit b896c4f95ab4 > ("samples/bpf: Add simple non-portable kprobe filter example") (and > following) from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Looks good. Thanks Stephen. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists