diff options
| author | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-08-04 12:18:36 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-08-04 12:18:36 -0400 |
| commit | a10fa9029e0f97d76d720ab70b2ac8f93c94d502 (patch) | |
| tree | 6477eabd718b41e3e6fa334719ccd3aa8dc5b11b | |
| parent | 17f0d73b219751760c86729c537b45168375f7a7 (diff) | |
| download | kernel-a10fa9029e0f97d76d720ab70b2ac8f93c94d502.tar.gz kernel-a10fa9029e0f97d76d720ab70b2ac8f93c94d502.tar.xz kernel-a10fa9029e0f97d76d720ab70b2ac8f93c94d502.zip | |
Actually branch 2.6.36 for rawhide
| -rw-r--r-- | config-arm | 7 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/config-arm b/config-arm index 7b13a8279..d0ba0f376 100644 --- a/config-arm +++ b/config-arm @@ -113,3 +113,10 @@ CONFIG_PERF_COUNTERS=y # CONFIG_MG_DISK is not set # CONFIG_GPIO_PL061 is not set + +CONFIG_CC_STACKPROTECTOR=y + +CONFIG_AUTO_ZRELADDR=y + +# CONFIG_ARM_CHARLCD is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set diff --git a/config-generic b/config-generic index f948700b2..b0491230e 100644 --- a/config-generic +++ b/config-generic @@ -3437,6 +3437,7 @@ CONFIG_CIFS_EXPERIMENTAL=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_WEAK_PW_HASH=y # CONFIG_CIFS_DEBUG2 is not set CONFIG_CIFS_DFS_UPCALL=y diff --git a/kernel.spec b/kernel.spec index 47e74bb6c..bd4d87361 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 +%global released_kernel 0 # Save original buildid for later if it's defined %if 0%{?buildid:1} @@ -1878,6 +1878,11 @@ fi %changelog * Wed Aug 04 2010 Kyle McMartin <kyle@redhat.com> +- Disable %released_kernel. +- This is properly 2.6.36-0.git1, unlike the last commit. Had to make + a mistake sometime, I'm glad it was early. + +* Wed Aug 04 2010 Kyle McMartin <kyle@redhat.com> - Linux 2.6.35-git1, beginning of rawhide for 2.6.36... * Sun Aug 01 2010 Dave Jones <davej@redhat.com> |