X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fpowerpc64;h=984cd6de34ca83d49497d4f867f3b671636cc449;hb=0f762a527d0339da55a3390cab6c162da055ec9a;hp=0f67db39a471f2bc3b130bbfa0417bf52647d3b0;hpb=974ec2a6e32395edf2fd03c0780fe538c93a1773;p=kernel-configs.git

diff --git a/4.14/powerpc64 b/4.14/powerpc64
index 0f67db3..984cd6d 100644
--- a/4.14/powerpc64
+++ b/4.14/powerpc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.92-gnu Kernel Configuration
+# Linux/powerpc 4.14.120-gnu Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -54,6 +54,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y
 CONFIG_PPC=y
+CONFIG_PPC_BARRIER_NOSPEC=y
 # CONFIG_GENERIC_CSUM is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_PANIC_TIMEOUT=0
@@ -3756,6 +3757,7 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
 
@@ -3853,7 +3855,6 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_HW_RANDOM_POWERNV=m
 CONFIG_HW_RANDOM_TPM=m
-CONFIG_R3964=m
 CONFIG_APPLICOM=m
 
 #
@@ -8257,9 +8258,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set