From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751074AbbDGHbh (ORCPT ); Tue, 7 Apr 2015 03:31:37 -0400 Received: from www62.your-server.de ([213.133.104.62]:60643 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752543AbbDGHbd (ORCPT ); Tue, 7 Apr 2015 03:31:33 -0400 Message-ID: <552387A5.5040007@iogearbox.net> Date: Tue, 07 Apr 2015 09:30:45 +0200 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , David Miller , netdev@vger.kernel.org CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexei Starovoitov Subject: Re: linux-next: manual merge of the tip tree with the net-next tree References: <20150407170056.2d89261e@canb.auug.org.au> In-Reply-To: <20150407170056.2d89261e@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.