diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-02-04 09:24:53 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-02-04 09:24:53 +0100 |
commit | 710607627563e6f74121d207e4606f543238f303 (patch) | |
tree | 14703249c9eb4512b8bc4dd0e9351cc7547824dc /kernel-s390x-zfcpdump-rhel.config | |
parent | 2310bfb9db6ac8bedbe0ef5d2b218abf57d6d979 (diff) | |
parent | c97f56fe27309b3394cab2fef4b3d454df7071f0 (diff) | |
download | kernel-rawhide-user-thl-vanilla-fedora.tar.gz kernel-rawhide-user-thl-vanilla-fedora.tar.xz kernel-rawhide-user-thl-vanilla-fedora.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc6.20230203git66a87fff1a87.47.vanilla.1.fc38kernel-6.2.0-0.rc6.20230203git66a87fff1a87.47.vanilla.1.fc37kernel-6.2.0-0.rc6.20230203git66a87fff1a87.47.vanilla.1.fc36rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ba38d1c29..480881cab 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3929,7 +3929,7 @@ CONFIG_NVME_TCP=m # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_OCFS2_FS is not set -# CONFIG_OCTEON_EP is not set +CONFIG_OCTEON_EP=m CONFIG_OCXL=m # CONFIG_OF is not set # CONFIG_OF_OVERLAY is not set @@ -5898,11 +5898,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y +CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y -CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set # CONFIG_SQUASHFS_FILE_CACHE is not set CONFIG_SQUASHFS_FILE_DIRECT=y @@ -6977,12 +6977,8 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILLYBUS is not set # CONFIG_XILLYUSB is not set CONFIG_XMON_DEFAULT_RO_MODE=y -# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT -# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT -# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT # CONFIG_XZ_DEC_MICROLZMA is not set CONFIG_XZ_DEC_POWERPC=y -# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT # CONFIG_XZ_DEC_TEST is not set CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y |