From 998a4be746a3dc3788b1ee365f7612d242ae0e52 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Sat, 6 Mar 2021 10:14:37 +0100
Subject: fragments: Remove superfluous options for 5.10

These options have either been merged into others or enabled
unconditionally.
---
 fragments/base/security    | 1 -
 fragments/net/nftables     | 1 -
 fragments/security/cgroups | 1 -
 3 files changed, 3 deletions(-)

(limited to 'fragments')

diff --git a/fragments/base/security b/fragments/base/security
index ba75a03..0ed122f 100644
--- a/fragments/base/security
+++ b/fragments/base/security
@@ -1,4 +1,3 @@
-CONFIG_REFCOUNT_FULL=y
 CONFIG_GCC_PLUGINS=y
 CONFIG_GCC_PLUGIN_STRUCTLEAK=y
 CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
diff --git a/fragments/net/nftables b/fragments/net/nftables
index 89dcf2c..eba1ced 100644
--- a/fragments/net/nftables
+++ b/fragments/net/nftables
@@ -12,7 +12,6 @@ CONFIG_NF_CONNTRACK_LABELS=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
 CONFIG_NF_TABLES=y
-CONFIG_NF_TABLES_SET=y
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=y
diff --git a/fragments/security/cgroups b/fragments/security/cgroups
index e3ed289..f51a028 100644
--- a/fragments/security/cgroups
+++ b/fragments/security/cgroups
@@ -4,4 +4,3 @@ CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y
-- 
cgit v1.2.3-2-gb3c3