From: Justin M. Forbes jforbes@fedoraproject.org
Flip values for FSCACHE and NETFS_SUPPORT to avoid mismatch
Upstream commit 915cd30cdea88 combines fscache and netfs. This resulted in a config mismatch. This update puts us back to where we were within the new code.
Signed-off-by: Justin M. Forbes jforbes@fedoraproject.org
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_FSCACHE b/redhat/configs/rhel/generic/CONFIG_FSCACHE rename from redhat/configs/pending-rhel/generic/CONFIG_FSCACHE rename to redhat/configs/rhel/generic/CONFIG_FSCACHE index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/CONFIG_FSCACHE +++ b/redhat/configs/rhel/generic/CONFIG_FSCACHE diff --git a/redhat/configs/pending-rhel/generic/CONFIG_NETFS_SUPPORT b/redhat/configs/rhel/generic/CONFIG_NETFS_SUPPORT rename from redhat/configs/pending-rhel/generic/CONFIG_NETFS_SUPPORT rename to redhat/configs/rhel/generic/CONFIG_NETFS_SUPPORT index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/CONFIG_NETFS_SUPPORT +++ b/redhat/configs/rhel/generic/CONFIG_NETFS_SUPPORT diff --git a/redhat/configs/pending-rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES rename from redhat/configs/pending-rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES rename to redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES +++ b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_CACHEFILES
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2904
kernel@lists.fedoraproject.org
-
Justin M. Forbes (via Email Bridge)