Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368AbdHAUPV (ORCPT ); Tue, 1 Aug 2017 16:15:21 -0400 Received: from www62.your-server.de ([213.133.104.62]:33211 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100AbdHAUPT (ORCPT ); Tue, 1 Aug 2017 16:15:19 -0400 Message-ID: <5980E154.2080303@iogearbox.net> Date: Tue, 01 Aug 2017 22:15:16 +0200 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Arnaldo Carvalho de Melo , Ingo Molnar CC: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , David Ahern , "David S . Miller" , Jiri Olsa , Namhyung Kim , Wang Nan Subject: Re: [PATCH 04/18] tools headers: Fixup tools/include/uapi/linux/bpf.h copy of kernel ABI header References: <20170801195645.16986-1-acme@kernel.org> <20170801195645.16986-5-acme@kernel.org> In-Reply-To: <20170801195645.16986-5-acme@kernel.org> 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 Content-Length: 955 Lines: 20 On 08/01/2017 09:56 PM, Arnaldo Carvalho de Melo wrote: > From: Arnaldo Carvalho de Melo > > In 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper") BPF_ADJ_ROOM_NET was > added to include/uapi/linux/bpf.h but BPF_ADJ_ROOM_NET_OPS was added to > tools/include/uapi/linux/bpf.h, making these files differ, fix it by using the > same name in both, BPF_ADJ_ROOM_NET, the one in the kernel headers copy. > > Cc: Adrian Hunter > Cc: Daniel Borkmann > Cc: David Ahern > Cc: David S. Miller > Cc: Jiri Olsa > Cc: Namhyung Kim > Cc: Wang Nan > Fixes: 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper") > Link: http://lkml.kernel.org/n/tip-2bmwovi9lymplyz6wsszppyf@git.kernel.org > Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Daniel Borkmann