From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, Jakub Kicinski <kuba@kernel•org>,
Abdul Haleem <abdhalee@linux•vnet.ibm.com>,
jesse.brandeburg@intel•com, anthony.l.nguyen@intel•com,
saeedm@nvidia•com, leon@kernel•org,
intel-wired-lan@lists•osuosl.org, linux-rdma@vger•kernel.org,
bpf@vger•kernel.org
Subject: [PATCH net-next] net: fixup build after bpf header changes
Date: Mon, 3 Jan 2022 19:48:27 -0800 [thread overview]
Message-ID: <20220104034827.1564167-1-kuba@kernel.org> (raw)
Recent bpf-next merge brought in header changes which uncovered
includes missing in net-next which were not present in bpf-next.
Build problems happen only on less-popular arches like hppa,
sparc, alpha etc.
I could repro the build problem with ice but not the mlx5 problem
Abdul was reporting. mlx5 does look like it should include filter.h,
anyway.
Reported-by: Abdul Haleem <abdhalee@linux•vnet.ibm.com>
Fixes: e63a02348958 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next")
Link: https://lore.kernel.org/all/7c03768d-d948-c935-a7ab-b1f963ac7eed@linux.vnet.ibm.com/
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
CC: jesse.brandeburg@intel•com
CC: anthony.l.nguyen@intel•com
CC: saeedm@nvidia•com
CC: leon@kernel•org
CC: intel-wired-lan@lists•osuosl.org
CC: linux-rdma@vger•kernel.org
CC: bpf@vger•kernel.org
---
drivers/net/ethernet/intel/ice/ice_nvm.c | 2 ++
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c
index cd739a2c64e8..4eb0599714f4 100644
--- a/drivers/net/ethernet/intel/ice/ice_nvm.c
+++ b/drivers/net/ethernet/intel/ice/ice_nvm.c
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2018, Intel Corporation. */
+#include <linux/vmalloc.h>
+
#include "ice_common.h"
/**
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index efcf9d30b131..31c911182498 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -37,6 +37,7 @@
#include <net/geneve.h>
#include <linux/bpf.h>
#include <linux/if_bridge.h>
+#include <linux/filter.h>
#include <net/page_pool.h>
#include <net/xdp_sock_drv.h>
#include "eswitch.h"
--
2.31.1
next reply other threads:[~2022-01-04 3:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-04 3:48 Jakub Kicinski [this message]
2022-01-04 7:24 ` [PATCH net-next] net: fixup build after bpf header changes Saeed Mahameed
2022-01-05 22:15 ` Saeed Mahameed
2022-01-04 7:54 ` Abdul Haleem
2022-01-04 12:40 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220104034827.1564167-1-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=abdhalee@linux$(echo .)vnet.ibm.com \
--cc=anthony.l.nguyen@intel$(echo .)com \
--cc=bpf@vger$(echo .)kernel.org \
--cc=davem@davemloft$(echo .)net \
--cc=intel-wired-lan@lists$(echo .)osuosl.org \
--cc=jesse.brandeburg@intel$(echo .)com \
--cc=leon@kernel$(echo .)org \
--cc=linux-rdma@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=saeedm@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox