diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-23 22:29:40 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-23 22:29:40 +0200 |
commit | 713a34942fd6d29c48947efa18f2eb0fac97bc9a (patch) | |
tree | 019e57fa6b8127d91270fa1792549e050448a725 /kernel-x86_64-debug-rhel.config | |
parent | 481402a568d58bec4f0fd5fda64dd15a78c2cdec (diff) | |
parent | a3e5988e12642b0e3c98bce30fd8bee8deb2c091 (diff) | |
download | kernel-713a34942fd6d29c48947efa18f2eb0fac97bc9a.tar.gz kernel-713a34942fd6d29c48947efa18f2eb0fac97bc9a.tar.xz kernel-713a34942fd6d29c48947efa18f2eb0fac97bc9a.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc7.20210623git0c18f29aae7c.53.vanilla.1.fc35
Diffstat (limited to 'kernel-x86_64-debug-rhel.config')
-rw-r--r-- | kernel-x86_64-debug-rhel.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 1802121a3..be9f5fbd0 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3460,7 +3460,7 @@ CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_IFE is not set # CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m -# CONFIG_NET_ACT_MPLS is not set +CONFIG_NET_ACT_MPLS=m # CONFIG_NET_ACT_NAT is not set CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_POLICE=m |