5 files changed, 21 insertions, 26 deletions

diff --git a/features/intel-e1xxxx/e1xxxx_m.cfg b/features/intel-e1xxxx/e1xxxx_m.cfg
index c05e8c6..5ed6444 100644
--- a/features/intel-e1xxxx/e1xxxx_m.cfg
+++ b/features/intel-e1xxxx/e1xxxx_m.cfg
@@ -1,3 +1,3 @@
 CONFIG_E1000=m
 CONFIG_E1000E=m
-CONFIG_E1000E_HWTS=m
+CONFIG_E1000E_HWTS=y
diff --git a/features/kvm/qemu-kvm_m.cfg b/features/kvm/qemu-kvm_m.cfg
index e9eb5bc..c37c88a 100644
--- a/features/kvm/qemu-kvm_m.cfg
+++ b/features/kvm/qemu-kvm_m.cfg
@@ -1,28 +1,28 @@
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HAVE_KVM=y
 CONFIG_VIRTUALIZATION=y
-CONFIG_PREEMPT_NOTIFIERS=y                
-CONFIG_MMU_NOTIFIER=y                     
-CONFIG_HAVE_KVM_IRQCHIP=y                 
-CONFIG_HAVE_KVM_IRQFD=y                   
-CONFIG_IRQ_BYPASS_MANAGER=y               
-CONFIG_HAVE_KVM_IRQ_BYPASS=y              
-CONFIG_HAVE_KVM_IRQ_ROUTING=y             
-CONFIG_HAVE_KVM_EVENTFD=y                 
-CONFIG_KVM_ASYNC_PF=y                     
-CONFIG_USER_RETURN_NOTIFIER=y             
-CONFIG_KVM_MMIO=y                         
-CONFIG_TASKSTATS=y                        
-CONFIG_TASK_DELAY_ACCT=y                  
-CONFIG_PERF_EVENTS=y                      
-CONFIG_HAVE_KVM_MSI=y                     
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y     
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_IRQ_BYPASS_MANAGER=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_KVM_MMIO=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_PERF_EVENTS=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_VFIO=y                         
-CONFIG_SRCU=y                             
+CONFIG_KVM_VFIO=y
+CONFIG_SRCU=y
 
 CONFIG_KVM=m
-CONFIG_KVM_INTEL=m    
+CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=n
 
diff --git a/features/nfs/nfs_n.cfg b/features/nfs/nfs_n.cfg
index f5788cb..9e51a3b 100644
--- a/features/nfs/nfs_n.cfg
+++ b/features/nfs/nfs_n.cfg
@@ -17,7 +17,6 @@ CONFIG_NFSD_V4=n
 # CONFIG_NFSD_SCSILAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
 # CONFIG_NFSD_V4_SECURITY_LABEL is not set
-# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_GRACE_PERIOD=n
 CONFIG_LOCKD=n
 CONFIG_LOCKD_V4=n
@@ -28,16 +27,12 @@ CONFIG_RPCSEC_GSS_KRB5=n
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=n
-# CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=n
 CONFIG_CIFS_POSIX=n
-# CONFIG_CIFS_ACL is not set
 CONFIG_CIFS_DEBUG=n
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_SMB2 is not set
-# CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
diff --git a/features/wlan/wlan_ath10k.cfg b/features/wlan/wlan_ath10k.cfg
index 68afc9a..b7be1f6 100644
--- a/features/wlan/wlan_ath10k.cfg
+++ b/features/wlan/wlan_ath10k.cfg
@@ -1,4 +1,5 @@
 # Atheros 10K
 CONFIG_WLAN_VENDOR_ATH=y
+CONFIG_ATH_COMMON=m
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
diff --git a/patches/boot_time_opt/raid_alg.cfg b/patches/boot_time_opt/raid_alg.cfg
index 6df4a7c..24d32ff 100644
--- a/patches/boot_time_opt/raid_alg.cfg
+++ b/patches/boot_time_opt/raid_alg.cfg
@@ -1,3 +1,2 @@
 CONFIG_RAID6_FORCE_ALGO=y
-CONFIG_RAID6_FORCE_INT=y
 CONFIG_RAID6_FORCE_AVX2=y