diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2021-01-12 20:27:05 +0000 |
|---|---|---|
| committer | Salvatore Bonaccorso <carnil@debian.org> | 2021-01-12 20:27:05 +0000 |
| commit | dbec72b92e509034c7fef6b2988a0f826779502f (patch) | |
| tree | 0213a6db1716e89792c8ec767c271db41e672f14 | |
| parent | 0bd1b7dc33ab2b8d539f2fceade506e645fef5e3 (diff) | |
| download | kernel_replicant_linux-dbec72b92e509034c7fef6b2988a0f826779502f.tar.gz kernel_replicant_linux-dbec72b92e509034c7fef6b2988a0f826779502f.tar.bz2 kernel_replicant_linux-dbec72b92e509034c7fef6b2988a0f826779502f.zip | |
Revert "Merge branch 'bpf_lsm' into 'sid'"
This reverts merge request !306
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/config | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 04d840e382f0..bf3f0259abf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,6 @@ linux (5.10.5-2) UNRELEASED; urgency=medium [ Aurelien Jarno ] * Ignore ABI change for dfltcc_* symbols. - [ Luca Boccassi ] - * bpf: enable CONFIG_BPF_LSM on all architectures. Not active by default. - -- Aurelien Jarno <aurel32@debian.org> Sun, 10 Jan 2021 13:08:43 +0100 linux (5.10.5-1) unstable; urgency=medium diff --git a/debian/config/config b/debian/config/config index 969ffe6e4f34..8179a45bbdf0 100644 --- a/debian/config/config +++ b/debian/config/config @@ -6404,7 +6404,6 @@ CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set -CONFIG_BPF_LSM=y CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_USERFAULTFD=y |