summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-11-16 08:50:36 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-11-16 08:51:24 -0500
commit6681651872abb7b022c2d8a66f3017ee84623d99 (patch)
tree91c612fdeb788f8f8d0644b0efe416f48c8fafa8
parente58fc2dbb821fd6c11816e7e964729324bd4b937 (diff)
downloadkernel-6681651872abb7b022c2d8a66f3017ee84623d99.tar.gz
kernel-6681651872abb7b022c2d8a66f3017ee84623d99.tar.xz
kernel-6681651872abb7b022c2d8a66f3017ee84623d99.zip
Kconfig: enable CONFIG_CIFS_SMB2
Enough of the CIFS SMB2 code has been merged into 3.7 that users can now mount SMB2.1 shares from servers that support it. It's still fairly experimental, but enabling the Kconfig option is unlikely to break users who are using SMB1. Let's go ahead and enable this in 3.7 kernels. I think this patch should be sufficient, but let me know if we should do anything else. Signed-off-by: Jeff Layton <jlayton@redhat.com>
-rw-r--r--config-generic2
-rw-r--r--kernel.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index 1ac35456..a27aedd4 100644
--- a/config-generic
+++ b/config-generic
@@ -3671,7 +3671,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
-# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_SMB2=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
diff --git a/kernel.spec b/kernel.spec
index 12231409..5ddea4c9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2338,6 +2338,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Nov 16 2012 Josh Boyer <jwboyer@redhat.com>
+- Add patch to enable CONFIG_CIFS_SMB2
+
* Fri Nov 16 2012 Josh Boyer <jwboyer@redhat.com> - 3.7.0-0.rc5.git2.1
- Linux v3.7-rc5-68-gc5e35d6