Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-10 12:02:11 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-10 12:02:11 +0200
commit803d5fb4ecff87a28cbc21a1386a296fda8c75ab (patch)
treeec215cbc96179b16939aa3b9af9bfd9bde6f43eb
parent20cd9dd7acd38fcb1d0e811732d60307fa799aa5 (diff)
Automatically updated to 5.2-next-20190709
-rw-r--r--patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch36
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
3 files changed, 1 insertions, 38 deletions
diff --git a/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch b/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
deleted file mode 100644
index 508481f2f2..0000000000
--- a/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 60f1d000300603afcd18ed4a27a4a4af374d867a Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Wed, 27 Feb 2019 13:11:22 +0100
-Subject: [PATCH] BPF: UMH: do not detect if compiler can link userspace
- program.
-
-References: boo#1127188
-Patch-mainline: no, SUSE specific
-
-SUSE crosscompilers cannot build userspace programs. They do not include
-libc and related headers.
-
-The configuration files are updated using such crosscompilers leading to
-this UMH symbol flipping and build kernel build failures due to
-configuration differences.
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
----
- net/bpfilter/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
-index e558b46596c4..2e9b6a8692ea 100644
---- a/net/bpfilter/Kconfig
-+++ b/net/bpfilter/Kconfig
-@@ -8,7 +8,6 @@ menuconfig BPFILTER
- if BPFILTER
- config BPFILTER_UMH
- tristate "bpfilter kernel module with user mode helper"
-- depends on $(success,$(srctree)/scripts/cc-can-link.sh $(CC))
- default m
- help
- This builds bpfilter kernel module with embedded user mode helper
---
-2.20.1
-
diff --git a/rpm/config.sh b/rpm/config.sh
index 8e1251c5de..e223907fb7 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.2-next-20190708
+SRCVERSION=5.2-next-20190709
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all
diff --git a/series.conf b/series.conf
index c77dce093f..c7dc531933 100644
--- a/series.conf
+++ b/series.conf
@@ -35,7 +35,6 @@
########################################################
patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch
patches.rpmify/Add-ksym-provides-tool.patch
- patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
########################################################
#