diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-09 08:10:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-09 08:10:02 +0200 |
commit | a586bd371cfa50223094f3527ef70f62c2299543 (patch) | |
tree | e1880bf3e23da534fb338fa7ee5b7c9bfe9e6503 /kernel-x86_64-fedora.config | |
parent | a339309f875b7240e2006d47992e0b50b643d86c (diff) | |
parent | 2f1ff80800f904f14b6510dcb30ae15183f46999 (diff) | |
download | kernel-a586bd371cfa50223094f3527ef70f62c2299543.tar.gz kernel-a586bd371cfa50223094f3527ef70f62c2299543.tar.xz kernel-a586bd371cfa50223094f3527ef70f62c2299543.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc36kernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc35kernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc34kernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc33
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 02c19e7c3..a6bd882f5 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1350,7 +1350,7 @@ CONFIG_DMABUF_HEAPS_SYSTEM=y CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set -# CONFIG_DMABUF_SYSFS_STATS is not set +CONFIG_DMABUF_SYSFS_STATS=y CONFIG_DMA_CMA=y # CONFIG_DMADEVICES_DEBUG is not set CONFIG_DMADEVICES=y @@ -2449,7 +2449,7 @@ CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m CONFIG_I2C_VIPERBOARD=m -# CONFIG_I2C_VIRTIO is not set +CONFIG_I2C_VIRTIO=m # CONFIG_I2C_XILINX is not set CONFIG_I2C=y # CONFIG_I3C is not set @@ -4529,7 +4529,10 @@ CONFIG_NTB_PINGPONG=m CONFIG_NTB_SWITCHTEC=m CONFIG_NTB_TOOL=m CONFIG_NTB_TRANSPORT=m -# CONFIG_NTFS3_FS is not set +# CONFIG_NTFS3_64BIT_CLUSTER is not set +CONFIG_NTFS3_FS=m +# CONFIG_NTFS3_FS_POSIX_ACL is not set +CONFIG_NTFS3_LZX_XPRESS=y # CONFIG_NTFS_FS is not set CONFIG_NULL_TTY=m CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -5116,7 +5119,7 @@ CONFIG_RD_GZIP=y CONFIG_RD_LZ4=y CONFIG_RD_LZMA=y CONFIG_RD_LZO=y -# CONFIG_RDMA_RXE is not set +CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS_DEBUG is not set CONFIG_RDS=m @@ -7476,7 +7479,7 @@ CONFIG_VDPA_MENU=y # CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m -# CONFIG_VDPA_USER is not set +CONFIG_VDPA_USER=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m |