From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id BFC01A051C
for <public@inbox.dpdk.org>; Tue, 11 Feb 2020 12:29:44 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id B3D832BF4;
Tue, 11 Feb 2020 12:29:44 +0100 (CET)
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
[209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 080D42BE9
for <stable@dpdk.org>; Tue, 11 Feb 2020 12:29:43 +0100 (CET)
Received: by mail-wr1-f66.google.com with SMTP id u6so11934767wrt.0
for <stable@dpdk.org>; Tue, 11 Feb 2020 03:29:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=v06FUu0UAkW8/9/pJCOuu4DqmnX+JtDxzcQeIuCnOsU=;
b=p6yYWUvLWdu11NvCm8XVqyghupLVxadKlmug/mmvJPiwlsNtBP+qAiM5ag9wW5LJ+T
phu/msIeZRgOLdJZOjEFNOr7RjO3J3k5TPy+HvpHmocVM8f/SiWG7vIGtJcyaYOQ/oeZ
PiN0SJhhz+k2NbIWF2zWRcLtQGuOIx3/cZc9oNu2oKHBxC4K4q/7SbgpKOFC4kKgZff9
v6KpZ2YbENd3+DSmgq25BW63rEJIgyH/galM/7g0inITnqP6yuf6UHWuupNJGkeLX4pd
nbE2QROTe+K/z3XzV5zkL/g6s9F71vm5I9szGuL823HnjqkNXvXGnZ5svJmLM/JbI1V0
S1Ug==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=v06FUu0UAkW8/9/pJCOuu4DqmnX+JtDxzcQeIuCnOsU=;
b=b/IQa129Rkf7cSQBCj84bZP5O616GYNS5qD9akAWfNqtEo2HQmksmBX6gHbUkTZTAH
p00YHdkiAArGo/dmyJYme6/cRiXoP15Sy03qMVN3qeQELbyGwPNUNO5dg98JOKOCK6dz
ACOx9Cqfc/K6CjHqTaTjMehDE/9PJdFRPgxPoBvOdE/z4qjCujnGH7pwHhSUXnAmSQcc
XGy6PYCpdkFkdRg4holXZWN2Rwm9xuHgoP96DNmbYaz1aBCAGNzlVFYlKOjmsTgtQp20
PLSayR64suhkImzwRKMxo/hzv0UH/qoKJr0Fqmtu/8o1qaftjc66cMj+UkfNFkRSb1yA
qduQ==
X-Gm-Message-State: APjAAAUehOyRa8c9fPuZSSHHd4g9H7O6wwZRAwa7BYx0FVwHiBCAcHBQ
kcbWFATjHdCxyRdsydpm/AE=
X-Google-Smtp-Source: APXvYqwGlhwkevv3H9/96t4LffMluskPY64VFfYL3RCxMsL6hJfcRlmr3BhALO+K23Xd/xG6jGpelQ==
X-Received: by 2002:a5d:4f0f:: with SMTP id c15mr8559892wru.251.1581420582717;
Tue, 11 Feb 2020 03:29:42 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id k7sm3286141wmi.19.2020.02.11.03.29.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 11 Feb 2020 03:29:41 -0800 (PST)
From: luca.boccassi@gmail.com
To: Ali Alnubani <alialnu@mellanox.com>
Cc: dpdk stable <stable@dpdk.org>
Date: Tue, 11 Feb 2020 11:20:51 +0000
Message-Id: <20200211112216.3929-105-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com>
References: <20200211112216.3929-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'eal/linux: fix build when VFIO is disabled'
has been queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From b01bd42ae75770b2622e9f58127c9772a49e236f Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu@mellanox.com>
Date: Wed, 11 Dec 2019 18:25:59 +0000
Subject: [PATCH] eal/linux: fix build when VFIO is disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit e8a17faa5ebc7067473b4948805753251dc0c2e9 ]
The header linux/version.h isn't included when CONFIG_RTE_EAL_VFIO
is explicitly disabled. LINUX_VERSION_CODE and KERNEL_VERSION are
therefore undefined, causing the build failure:
lib/librte_eal/linux/eal/eal.c: In function ‘rte_eal_init’:
lib/librte_eal/linux/eal/eal.c:1076:32: error: "LINUX_VERSION_CODE" is
not defined, evaluates to 0 [-Werror=undef]
Fixes: a0dede62a537 ("eal/linux: remove KNI restriction on IOVA")
Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
lib/librte_eal/linux/eal/eal.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index c4233ec3c8..9530ee55f8 100644
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -25,6 +25,7 @@
#if defined(RTE_ARCH_X86)
#include <sys/io.h>
#endif
+#include <linux/version.h>
#include <rte_compat.h>
#include <rte_common.h>
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-11 11:17:42.495532340 +0000
+++ 0105-eal-linux-fix-build-when-VFIO-is-disabled.patch 2020-02-11 11:17:38.572004563 +0000
@@ -1,4 +1,4 @@
-From e8a17faa5ebc7067473b4948805753251dc0c2e9 Mon Sep 17 00:00:00 2001
+From b01bd42ae75770b2622e9f58127c9772a49e236f Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu@mellanox.com>
Date: Wed, 11 Dec 2019 18:25:59 +0000
Subject: [PATCH] eal/linux: fix build when VFIO is disabled
@@ -6,6 +6,8 @@
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
+[ upstream commit e8a17faa5ebc7067473b4948805753251dc0c2e9 ]
+
The header linux/version.h isn't included when CONFIG_RTE_EAL_VFIO
is explicitly disabled. LINUX_VERSION_CODE and KERNEL_VERSION are
therefore undefined, causing the build failure:
@@ -15,7 +17,6 @@
not defined, evaluates to 0 [-Werror=undef]
Fixes: a0dede62a537 ("eal/linux: remove KNI restriction on IOVA")
-Cc: stable@dpdk.org
Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---