Actually branch 2.6.36 for rawhide

This commit is contained in:
Kyle McMartin 2010-08-04 12:18:36 -04:00
parent 17f0d73b21
commit a10fa9029e
3 changed files with 14 additions and 1 deletions

View File

@ -113,3 +113,10 @@ CONFIG_PERF_COUNTERS=y
# CONFIG_MG_DISK is not set # CONFIG_MG_DISK is not set
# CONFIG_GPIO_PL061 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

View File

@ -3437,6 +3437,7 @@ CONFIG_CIFS_EXPERIMENTAL=y
CONFIG_CIFS_UPCALL=y CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
CONFIG_CIFS_FSCACHE=y
CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_WEAK_PW_HASH=y
# CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DEBUG2 is not set
CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_DFS_UPCALL=y

View File

@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide # 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 # and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0. # be 0.
%global released_kernel 1 %global released_kernel 0
# Save original buildid for later if it's defined # Save original buildid for later if it's defined
%if 0%{?buildid:1} %if 0%{?buildid:1}
@ -1877,6 +1877,11 @@ fi
# || || # || ||
%changelog %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> * Wed Aug 04 2010 Kyle McMartin <kyle@redhat.com>
- Linux 2.6.35-git1, beginning of rawhide for 2.6.36... - Linux 2.6.35-git1, beginning of rawhide for 2.6.36...