Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-07-09 22:45:23 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-07-09 22:45:23 +0200
commit709e0a43d43ded45f5b5ff4e64b8892e55748cc8 (patch)
tree70aaa74632f6a3f4b4200a9be4e771ad3edff772
parent2a76a3cb840576d6f13c68768ce32aec3f9853c8 (diff)
parent60b7ba25285175424e19e6fb1085c0a0a1e7e7d2 (diff)
Merge remote-tracking branch 'origin/users/jslaby/linux-next/for-next' into linux-next
-rw-r--r--patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch36
l---------scripts/guards1
-rw-r--r--series.conf1
3 files changed, 1 insertions, 37 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/scripts/guards b/scripts/guards
new file mode 120000
index 0000000000..709cc82776
--- /dev/null
+++ b/scripts/guards
@@ -0,0 +1 @@
+../rpm/guards \ No newline at end of file
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
########################################################
#