fix merge
This commit is contained in:
commit
078f71f7dd
@ -96,6 +96,7 @@ CONFIG_PCI_DEFAULT_USE_CRS=y
|
|||||||
|
|
||||||
CONFIG_KGDB_KDB=y
|
CONFIG_KGDB_KDB=y
|
||||||
CONFIG_KDB_KEYBOARD=y
|
CONFIG_KDB_KEYBOARD=y
|
||||||
|
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
|
||||||
|
|
||||||
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
|
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
|
||||||
CONFIG_TEST_LIST_SORT=y
|
CONFIG_TEST_LIST_SORT=y
|
||||||
|
@ -202,6 +202,7 @@ CONFIG_MTD=m
|
|||||||
# CONFIG_MTD_TESTS is not set
|
# CONFIG_MTD_TESTS is not set
|
||||||
# CONFIG_MTD_REDBOOT_PARTS is not set
|
# CONFIG_MTD_REDBOOT_PARTS is not set
|
||||||
# CONFIG_MTD_AR7_PARTS is not set
|
# CONFIG_MTD_AR7_PARTS is not set
|
||||||
|
# CONFIG_MTD_CMDLINE_PARTS is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# User Modules And Translation Layers
|
# User Modules And Translation Layers
|
||||||
@ -432,6 +433,7 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128
|
|||||||
CONFIG_SCSI_MPT3SAS_LOGGING=y
|
CONFIG_SCSI_MPT3SAS_LOGGING=y
|
||||||
|
|
||||||
CONFIG_SCSI_UFSHCD=m
|
CONFIG_SCSI_UFSHCD=m
|
||||||
|
CONFIG_SCSI_UFSHCD_PCI=m
|
||||||
|
|
||||||
CONFIG_SCSI_MVUMI=m
|
CONFIG_SCSI_MVUMI=m
|
||||||
|
|
||||||
@ -593,6 +595,7 @@ CONFIG_DM_MIRROR=y
|
|||||||
CONFIG_DM_MULTIPATH=m
|
CONFIG_DM_MULTIPATH=m
|
||||||
CONFIG_DM_SNAPSHOT=y
|
CONFIG_DM_SNAPSHOT=y
|
||||||
CONFIG_DM_THIN_PROVISIONING=m
|
CONFIG_DM_THIN_PROVISIONING=m
|
||||||
|
# CONFIG_DM_CACHE is not set
|
||||||
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
|
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
|
||||||
# CONFIG_DM_DEBUG_SPACE_MAPS is not set
|
# CONFIG_DM_DEBUG_SPACE_MAPS is not set
|
||||||
CONFIG_DM_UEVENT=y
|
CONFIG_DM_UEVENT=y
|
||||||
|
@ -96,6 +96,7 @@ CONFIG_PCI_DEFAULT_USE_CRS=y
|
|||||||
|
|
||||||
CONFIG_KGDB_KDB=y
|
CONFIG_KGDB_KDB=y
|
||||||
CONFIG_KDB_KEYBOARD=y
|
CONFIG_KDB_KEYBOARD=y
|
||||||
|
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
|
||||||
|
|
||||||
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
|
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
|
||||||
CONFIG_TEST_LIST_SORT=y
|
CONFIG_TEST_LIST_SORT=y
|
||||||
|
@ -95,7 +95,7 @@ Summary: The Linux kernel
|
|||||||
# The rc snapshot level
|
# The rc snapshot level
|
||||||
%define rcrev 0
|
%define rcrev 0
|
||||||
# The git snapshot level
|
# The git snapshot level
|
||||||
%define gitrev 14
|
%define gitrev 15
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%define rpmversion 3.%{upstream_sublevel}.0
|
%define rpmversion 3.%{upstream_sublevel}.0
|
||||||
%endif
|
%endif
|
||||||
@ -2273,6 +2273,9 @@ fi
|
|||||||
* Mon Mar 4 2013 Peter Robinson <pbrobinson@fedoraproject.org>
|
* Mon Mar 4 2013 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||||
- Minor ARM updates
|
- Minor ARM updates
|
||||||
|
|
||||||
|
* Sun Mar 03 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git15.1
|
||||||
|
- Linux v3.8-10734-ga7c1120
|
||||||
|
|
||||||
* Fri Mar 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git14.1
|
* Fri Mar 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git14.1
|
||||||
- Linux v3.8-10206-gb0af9cd
|
- Linux v3.8-10206-gb0af9cd
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user