diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:37:28 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:55:08 +0000 |
| commit | 7df09ee0ab3e7962ef27859ce87e06a323059284 (patch) | |
| tree | d81334f742ddcb9a1ee63961ca6410922980af1c /gnu/packages/aux-files/linux-libre/6.1-i686.conf | |
| parent | 2ac51ec99b58b50c08ba719a8c7e9dba0330b065 (diff) | |
| parent | af95f2d8f98eb2c8c64954bb2fd0b70838899174 (diff) | |
| download | guix-7df09ee0ab3e7962ef27859ce87e06a323059284.tar.gz | |
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts: gnu/local.mk gnu/packages/autotools.scm gnu/packages/cmake.scm gnu/packages/gnuzilla.scm gnu/packages/haskell.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/samba.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/wxwidgets.scm
Diffstat (limited to 'gnu/packages/aux-files/linux-libre/6.1-i686.conf')
| -rw-r--r-- | gnu/packages/aux-files/linux-libre/6.1-i686.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/aux-files/linux-libre/6.1-i686.conf b/gnu/packages/aux-files/linux-libre/6.1-i686.conf index b91ff79b72..58f84b901a 100644 --- a/gnu/packages/aux-files/linux-libre/6.1-i686.conf +++ b/gnu/packages/aux-files/linux-libre/6.1-i686.conf @@ -111,7 +111,7 @@ CONFIG_HAVE_EBPF_JIT=y # CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT is not set -# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPF_PRELOAD is not set # end of BPF subsystem @@ -1810,7 +1810,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set +CONFIG_NET_DROP_MONITOR=m # end of Network testing # end of Networking options |