From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753004AbdHJQbm (ORCPT ); Thu, 10 Aug 2017 12:31:42 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37945 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752767AbdHJQbl (ORCPT ); Thu, 10 Aug 2017 12:31:41 -0400 Date: Thu, 10 Aug 2017 09:29:00 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, mingo@kernel.org, wangnan0@huawei.com, jolsa@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, acme@redhat.com, davem@davemloft.net, daniel@iogearbox.net, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org Reply-To: jolsa@kernel.org, mingo@kernel.org, dsahern@gmail.com, wangnan0@huawei.com, adrian.hunter@intel.com, davem@davemloft.net, hpa@zytor.com, acme@redhat.com, daniel@iogearbox.net, namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools headers: Fixup tools/include/uapi/linux/bpf.h copy of kernel ABI header Git-Commit-ID: d62c1d7213b77eb4952a873ad57727e991ac3306 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d62c1d7213b77eb4952a873ad57727e991ac3306 Gitweb: http://git.kernel.org/tip/d62c1d7213b77eb4952a873ad57727e991ac3306 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 31 Jul 2017 10:45:07 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 31 Jul 2017 10:45:07 -0300 tools headers: Fixup tools/include/uapi/linux/bpf.h copy of kernel ABI header 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 --- tools/include/uapi/linux/bpf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index ce2988b..8ff155f 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -643,7 +643,7 @@ enum bpf_func_id { /* Mode for BPF_FUNC_skb_adjust_room helper. */ enum bpf_adj_room_mode { - BPF_ADJ_ROOM_NET_OPTS, + BPF_ADJ_ROOM_NET, }; /* user accessible mirror of in-kernel sk_buff.