netdev - Re: linux-next: manual merge of the tip tree with the net-next tree

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:	Tue, 07 Apr 2015 09:30:45 +0200
From:	Daniel Borkmann <daniel@...earbox.net>
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,
	Alexei Starovoitov <ast@...mgrid.com>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree

On 04/07/2015 09:00 AM, Stephen Rothwell wrote:
...
> Today's linux-next merge of the tip tree got a conflict in
> include/linux/bpf.h between commit 0fc174dea545 ("ebpf: make internal
> bpf API independent of CONFIG_BPF_SYSCALL ifdefs") from the net-next
> tree and commit 4e537f7fbdce ("bpf: Make internal bpf API independent
> of CONFIG_BPF_SYSCALL #ifdefs") from the tip tree.
>
> I fixed it up (they are the same patch and there are other changes in
> the net-next tree, so I just used that version) and can carry the fix
> as necessary (no action is required).

Thanks, Stephen! That is correct.
--
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