diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-28 18:26:28 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-28 18:26:28 +0200 |
commit | 59822620d40830123a5321a93d86c47a1f68fdbf (patch) | |
tree | 13d2235c726510bd2e78a491c04781a188487731 /kernel-s390x-zfcpdump-rhel.config | |
parent | 6df1357e8570ace5c08ba2611e5f991fcc762861 (diff) | |
parent | 5ab16d21834c75e9a092dffbda8a808ca480272f (diff) | |
download | kernel-5.14.0-0.rc3.20210728git7d549995d4e0.31.vanilla.1.fc35.tar.gz kernel-5.14.0-0.rc3.20210728git7d549995d4e0.31.vanilla.1.fc35.tar.xz kernel-5.14.0-0.rc3.20210728git7d549995d4e0.31.vanilla.1.fc35.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc3.20210728git7d549995d4e0.31.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 1cd0d2ae3..73b642903 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2013,7 +2013,6 @@ CONFIG_ICE=m # CONFIG_ICPLUS_PHY is not set # CONFIG_ICS932S401 is not set # CONFIG_ICST is not set -# CONFIG_IDE is not set # CONFIG_IDLE_INJECT is not set CONFIG_IDLE_PAGE_TRACKING=y CONFIG_IEEE802154_6LOWPAN=m @@ -2707,7 +2706,7 @@ CONFIG_LLC=m CONFIG_LOAD_IPL_KEYS=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_LOCKDEP_BITS=15 +CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_CHAINS_BITS=16 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 # CONFIG_LOCKDEP is not set @@ -2992,7 +2991,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set # CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_TPS68470 is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set CONFIG_MFD_VIPERBOARD=m @@ -4184,7 +4182,6 @@ CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set # CONFIG_QUOTA is not set # CONFIG_QUOTA_NETLINK_INTERFACE is not set -# CONFIG_R3964 is not set CONFIG_R8169=m # CONFIG_R8188EU is not set # CONFIG_R8712U is not set @@ -4210,7 +4207,6 @@ CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set # CONFIG_RAS is not set -CONFIG_RAW_DRIVER=y # CONFIG_RBTREE_TEST is not set CONFIG_RC_ATI_REMOTE=m # CONFIG_RC_CORE is not set |