rpms/kernel/F-11 Makefile, 1.102, 1.103 config-arm, 1.2, 1.3 config-debug, 1.27, 1.28 config-generic, 1.286, 1.287 config-ia64-generic, 1.24, 1.25 config-nodebug, 1.36, 1.37 config-powerpc-generic, 1.40, 1.41 config-powerpc64, 1.28, 1.29 config-s390x, 1.12, 1.13 config-sparc64-generic, 1.25, 1.26 config-sparc64-smp, 1.3, 1.4 config-x86-generic, 1.77, 1.78 config-x86_64-generic, 1.77, 1.78 kernel.spec, 1.1680, 1.1681
Kyle McMartin
kyle at fedoraproject.org
Sat Jul 25 03:16:39 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1024
Modified Files:
Makefile config-arm config-debug config-generic
config-ia64-generic config-nodebug config-powerpc-generic
config-powerpc64 config-s390x config-sparc64-generic
config-sparc64-smp config-x86-generic config-x86_64-generic
kernel.spec
Log Message:
* Fri Jul 24 2009 Kyle McMartin <kyle at redhat.com>
- Copy over release configs from devel-2.6.30 tag.
- Fix up some spec deviations.
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/Makefile,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- Makefile 8 Apr 2009 15:33:29 -0000 1.102
+++ Makefile 25 Jul 2009 03:16:38 -0000 1.103
@@ -71,6 +71,7 @@ debug:
@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
+ @perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
@# just in case we're going from extremedebug -> debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -116,6 +117,7 @@ release:
@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
+ @perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
Index: config-arm
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-arm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- config-arm 26 Jan 2009 20:24:02 -0000 1.2
+++ config-arm 25 Jul 2009 03:16:38 -0000 1.3
@@ -8,6 +8,8 @@ CONFIG_ARCH_VERSATILE=y
CONFIG_ARCH_VERSATILE_PB=y
CONFIG_MACH_VERSATILE_AB=y
+CONFIG_HIGHMEM=y
+
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
@@ -91,3 +93,5 @@ CONFIG_RTC_DRV_PL031=m
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_ERRORS is not set
# CONFIG_DEBUG_LL is not set
+
+CONFIG_ARM_UNWIND=y
Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-debug,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- config-debug 1 Jul 2009 02:26:10 -0000 1.27
+++ config-debug 25 Jul 2009 03:16:38 -0000 1.28
@@ -50,6 +50,3 @@ CONFIG_DEBUG_NOTIFIERS=y
CONFIG_DMA_API_DEBUG=y
CONFIG_MMIOTRACE=y
-
-# for bug #494067
-CONFIG_DEBUG_CREDENTIALS=y
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- config-generic 1 Jul 2009 02:26:10 -0000 1.286
+++ config-generic 25 Jul 2009 03:16:38 -0000 1.287
@@ -16,6 +16,7 @@ CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_BUILD_DOCSRC=y
+CONFIG_DYNAMIC_DEBUG=y
#
# General setup
@@ -78,9 +79,10 @@ CONFIG_KMOD=y
CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_STUB=y
+CONFIG_PCI_IOV=y
CONFIG_HT_IRQ=y
CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_DEFAULT_ON=y
+# CONFIG_PCI_MSI_DEFAULT_ON is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
CONFIG_PCIEASPM=y
@@ -121,6 +123,7 @@ CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_WBSD=m
+CONFIG_MMC_VIA_SDMMC=m
CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_MTHCA=m
@@ -515,6 +518,15 @@ CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS_LOGGING=y
+
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
CONFIG_ATA=y
CONFIG_ATA_SFF=y
@@ -613,7 +625,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_DC395x=m
# CONFIG_SCSI_NSP32 is not set
-CONFIG_SCSI_DEBUG=m
+# CONFIG_SCSI_DEBUG is not set
CONFIG_SCSI_DC390T=m
CONFIG_SCSI_QLA_FC=m
CONFIG_SCSI_QLA_ISCSI=m
@@ -786,6 +798,9 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_PIMSM_V2=y
+CONFIG_RDS=m
+# CONFIG_RDS_DEBUG is not set
+
CONFIG_NET_9P=m
CONFIG_NET_9P_FD=m
CONFIG_NET_9P_VIRTIO=m
@@ -816,6 +831,7 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -846,6 +862,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_BRIDGE_NETFILTER=y
@@ -1071,6 +1089,9 @@ CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y
CONFIG_NETDEVICES=y
+# disable later --kyle
+CONFIG_COMPAT_NET_DEV_OPS=y
+
#
# ARCnet devices
#
@@ -1127,8 +1148,8 @@ CONFIG_ATM_NICSTAR=m
# CONFIG_ATM_IA_DEBUG is not set
# CONFIG_ATM_SOLOS is not set
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
#
# Ethernet (10 or 100Mbit)
@@ -1231,6 +1252,7 @@ CONFIG_DE600=m
CONFIG_DE620=m
CONFIG_CASSINI=m
# CONFIG_FEC_8XX is not set
+CONFIG_ETHOC=m
#
# Ethernet (1000 Mbit)
@@ -1245,6 +1267,7 @@ CONFIG_E1000E=m
CONFIG_IGB=m
# CONFIG_IGB_LRO is not set
CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
@@ -1278,6 +1301,8 @@ CONFIG_NETXEN_NIC=m
CONFIG_NIU=m
CONFIG_S2IO=m
CONFIG_S2IO_NAPI=y
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
CONFIG_TEHUTI=m
CONFIG_ENIC=m
CONFIG_MLX4_EN=m
@@ -1353,6 +1378,7 @@ CONFIG_ATH5K=m
CONFIG_ATH5K_DEBUG=y
CONFIG_ATH9K=m
# CONFIG_ATH9K_DEBUG is not set
+CONFIG_AT76C50X_USB=m
CONFIG_AIRO=m
CONFIG_AIRO_CS=m
CONFIG_ATMEL=m
@@ -1388,16 +1414,14 @@ CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_DEBUG=y
CONFIG_LIBERTAS_THINFIRM=m
CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_IWLCORE=m
-CONFIG_IWLCORE_RFKILL=y
+CONFIG_IWLWIFI=m
CONFIG_IWLWIFI_LEDS=y
CONFIG_IWLWIFI_RUN_TIME_CALIB=y
CONFIG_IWLWIFI_DEBUG=y
CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLWIFI_RFKILL=y
+CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
CONFIG_IWLAGN=m
-CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y
-CONFIG_IWLAGN_LEDS=y
CONFIG_IWL4965=y
CONFIG_IWL5000=y
CONFIG_IWL5000_RUN_TIME_CALIB=y
@@ -1414,12 +1438,13 @@ CONFIG_P54_PCI=m
CONFIG_PCI_HERMES=m
CONFIG_PLX_HERMES=m
CONFIG_PCI_ATMEL=m
+CONFIG_MWL8K=m
CONFIG_PRISM54=m
CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m
CONFIG_PCMCIA_ATMEL=m
CONFIG_PCMCIA_WL3501=m
-CONFIG_RT2X00=y
+CONFIG_RT2X00=m
CONFIG_RT2X00_LIB_DEBUGFS=y
# CONFIG_RT2X00_DEBUG is not set
CONFIG_RT2400PCI=m
@@ -1442,7 +1467,7 @@ CONFIG_USB_ZD1201=m
CONFIG_USB_NET_RNDIS_WLAN=m
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
-
+CONFIG_AR9170_USB=m
#
# Token Ring devices
@@ -1804,6 +1829,7 @@ CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
@@ -1983,6 +2009,7 @@ CONFIG_SENSORS_F71805F=m
CONFIG_SENSORS_F71882FG=m
CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_HDAPS=m
@@ -2013,6 +2040,7 @@ CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCA9539=m
CONFIG_SENSORS_PCF8574=m
CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SIS5595=m
CONFIG_SENSORS_SMSC47M1=m
CONFIG_SENSORS_SMSC47M192=m
@@ -2020,6 +2048,7 @@ CONFIG_SENSORS_SMSC47B397=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TSL2550=m
CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
CONFIG_SENSORS_VT1211=m
CONFIG_SENSORS_VT8231=m
CONFIG_SENSORS_W83627HF=m
@@ -2030,6 +2059,8 @@ CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_W83791D=m
CONFIG_SENSORS_W83792D=m
CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LM95241=m
CONFIG_W1=m
CONFIG_W1_CON=y
@@ -2100,6 +2131,7 @@ CONFIG_USBPCWATCHDOG=m
CONFIG_WM8350_WATCHDOG=m
CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
# CONFIG_RTC_DEBUG is not set
@@ -2276,6 +2308,7 @@ CONFIG_MEDIA_ATTACH=y
#
CONFIG_DVB_CAPTURE_DRIVERS=y
CONFIG_DVB_CORE=m
+CONFIG_DVB_DYNAMIC_MINORS=y
# CONFIG_DVB_FE_CUSTOMISE is not set
@@ -2293,13 +2326,12 @@ CONFIG_DVB_USB_AF9015=m
CONFIG_DVB_USB_ANYSEE=m
CONFIG_DVB_USB_DW2102=m
CONFIG_DVB_DM1105=m
-CONFIG_DVB_DYNAMIC_MINORS=y
+CONFIG_DVB_DRX397XD=m
CONFIG_DVB_LGDT3304=m
+CONFIG_DVB_S921=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_S921=m
-# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_DUMMY_FE=m
#
# Supported SAA7146 based PCI Adapters
@@ -2341,6 +2373,7 @@ CONFIG_DVB_USB_GL861=m
CONFIG_DVB_USB_GP8PSK=m
CONFIG_DVB_USB_M920X=m
CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_OPERA1=m
CONFIG_DVB_USB_TTUSB2=m
CONFIG_DVB_USB_UMT_010=m
@@ -2350,7 +2383,6 @@ CONFIG_DVB_USB_VP7045=m
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_VIDEO_TUNER=m
-CONFIG_DVB_USB_CE6230=m
# CONFIG_VIDEO_TUNER_CUSTOMISE is not set
CONFIG_VIDEO_BTCX=m
CONFIG_VIDEO_PVRUSB2=m
@@ -2371,6 +2403,7 @@ CONFIG_VIDEO_SELECT=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_3DFX=m
CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
CONFIG_FB_ATY128=m
@@ -2404,7 +2437,9 @@ CONFIG_FB_MATROX_I2C=m
CONFIG_FB_MATROX_MAVEN=m
CONFIG_FB_MATROX_MULTIHEAD=y
CONFIG_FB_NEOMAGIC=m
-# CONFIG_FB_NVIDIA is not set
+CONFIG_FB_NVIDIA=m
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_I2C=y
# CONFIG_FB_PM2 is not set
# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
# CONFIG_FB_PM3 is not set
@@ -2440,7 +2475,7 @@ CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_LIME=y
# CONFIG_FB_PRE_INIT_FB is not set
# CONFIG_FB_TMIO is not set
-CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_BROADSHEET is not set
# CONFIG_FIRMWARE_EDID is not set
@@ -2510,6 +2545,8 @@ CONFIG_SND_DRIVERS=y
#
CONFIG_SND_AD1889=m
# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_MSND_PINNACLE is not set
+# CONFIG_SND_MSND_CLASSIC is not set
#
# PCI devices
@@ -2558,7 +2595,7 @@ CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_CODEC_NVHDMI=y
CONFIG_SND_HDA_GENERIC=y
CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDSPM=m
CONFIG_SND_HIFIER=m
@@ -2693,10 +2730,10 @@ CONFIG_GREENASIA_FF=m
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_PANTHERLORD_FF=y
CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=y
CONFIG_ZEROPLUS_FF=y
CONFIG_USB_HIDDEV=y
CONFIG_USB_IDMOUSE=m
+CONFIG_DRAGONRISE_FF=m
#
# USB Imaging devices
@@ -2778,6 +2815,7 @@ CONFIG_USB_NET_PLUSB=m
CONFIG_USB_NET_MCS7830=m
CONFIG_USB_NET_RNDIS_HOST=m
CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_ZAURUS=m
#
@@ -2812,6 +2850,9 @@ CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_CYBERJACK=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SYMBOL=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_EMPEG=m
@@ -2853,7 +2894,6 @@ CONFIG_USB_SERIAL_SAFE=m
CONFIG_USB_SERIAL_SAFE_PADDED=y
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
CONFIG_USB_SERIAL_TI=m
CONFIG_USB_SERIAL_VISOR=m
@@ -2943,6 +2983,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_CHARGER_PCF50633=m
CONFIG_REGULATOR_PCF50633=m
CONFIG_RTC_DRV_PCF50633=m
@@ -2965,6 +3006,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT2_FS_XIP=y
CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
@@ -3007,6 +3049,18 @@ CONFIG_DNOTIFY=y
# Autofsv3 is obsolete.
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_NILFS2_FS=m
+
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
#
# CD-ROM/DVD Filesystems
@@ -3031,6 +3085,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_HUGETLBFS=y
@@ -3087,6 +3142,7 @@ CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
CONFIG_NFSD_TCP=y
+CONFIG_NFS_FSCACHE=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
@@ -3140,8 +3196,7 @@ CONFIG_CONFIGFS_FS=m
CONFIG_DLM=m
CONFIG_DLM_DEBUG=y
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_NOLOCK=m
-CONFIG_GFS2_FS_LOCKING_DLM=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
CONFIG_UBIFS_FS=m
CONFIG_UBIFS_FS_XATTR=y
@@ -3281,6 +3336,7 @@ CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_D
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
@@ -3292,7 +3348,6 @@ CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=m
# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_ARC4=m
@@ -3359,6 +3414,7 @@ CONFIG_CRC_CCITT=m
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=m
+CONFIG_CRYPTO_ZLIB=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
@@ -3374,6 +3430,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
CONFIG_FB_RIVA_BACKLIGHT=y
CONFIG_FB_RADEON_BACKLIGHT=y
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -3411,6 +3468,8 @@ CONFIG_ENABLE_MUST_CHECK=y
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_KEXEC=y
@@ -3454,7 +3513,6 @@ CONFIG_SCSI_ARCMSR_AER=y
# CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_MVSAS=m
# CONFIG_EL1 is not set
# CONFIG_EL2 is not set
@@ -3582,6 +3640,8 @@ CONFIG_SND_ECHO3G=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INDIGOIO=m
CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
# CONFIG_SND_SOC is not set
## END of ISA options.
@@ -3599,6 +3659,8 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_NET48XX is not set
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_BD2802 is not set
# CONFIG_LEDS_S3C24XX is not set
# CONFIG_LEDS_SPITZ is not set
# CONFIG_LEDS_TOSA is not set
@@ -3616,6 +3678,7 @@ CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
CONFIG_NET_DMA=y
# CONFIG_DMATEST is not set
+CONFIG_ASYNC_TX_DMA=y
CONFIG_UNUSED_SYMBOLS=y
@@ -3626,6 +3689,10 @@ CONFIG_IRQSOFF_TRACER=y
CONFIG_SCHED_TRACER=y
CONFIG_PROCESS_TRACER=y
CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_WORKQUEUE_TRACER=y
+CONFIG_EVENT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_KMEMTRACE=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
@@ -3663,6 +3730,7 @@ CONFIG_UIO_CIF=m
CONFIG_UIO_SMX=m
CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_INSTRUMENTATION=y
@@ -3720,6 +3788,7 @@ CONFIG_INPUT_APANEL=m
# CONFIG_INTEL_MENLOW is not set
CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_ISL29003=m
CONFIG_IPWIRELESS=m
CONFIG_RTC_DRV_DS1511=m
CONFIG_CGROUP_MEM_CONT=y
@@ -3778,6 +3847,7 @@ CONFIG_W83697UG_WDT=m
CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
CONFIG_REGULATOR_BQ24022=m
CONFIG_REGULATOR_WM8350=m
@@ -3828,6 +3898,16 @@ CONFIG_USB_ATMEL=m
# CONFIG_INPUT_MIMIO is not set
# CONFIG_TRANZPORT is not set
# CONFIG_EPL is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_USB_SERIAL_ATEN2011 is not set
+# CONFIG_B3DFG is not set
+# CONFIG_DST is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_HECI is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
+# CONFIG_RT3070 is not set
#
# Android
@@ -3853,10 +3933,20 @@ CONFIG_SECURITYFS=y
CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_NOP_USB_XCEIV=m
+
+# CONFIG_IMA is not set
+
+# CONFIG_PAGE_POISONING is not set
+
+CONFIG_SLOW_WORK=y
+
# CONFIG_CRASH_DUMP is not set
# CONFIG_CRASH is not set
-CONFIG_MMC_VIA_SDMMC=m
+CONFIG_STRIP_ASM_SYMS=y
Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-ia64-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- config-ia64-generic 30 Apr 2009 20:02:23 -0000 1.24
+++ config-ia64-generic 25 Jul 2009 03:16:38 -0000 1.25
@@ -70,6 +70,7 @@ CONFIG_TCG_INFINEON=m
# CONFIG_HW_RANDOM is not set
# CONFIG_GEN_RTC is not set
CONFIG_EFI_RTC=y
+CONFIG_RTC_DRV_EFI=y
#
Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-nodebug,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- config-nodebug 1 Jul 2009 02:26:10 -0000 1.36
+++ config-nodebug 25 Jul 2009 03:16:38 -0000 1.37
@@ -49,6 +49,3 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_MMIOTRACE is not set
-
-# for bug #494067
-# CONFIG_DEBUG_CREDENTIALS is not set
Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc-generic,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- config-powerpc-generic 4 May 2009 07:54:51 -0000 1.40
+++ config-powerpc-generic 25 Jul 2009 03:16:38 -0000 1.41
@@ -36,6 +36,7 @@ CONFIG_HIBERNATION=y
# CONFIG_GEN_RTC is not set
# CONFIG_GEN_RTC_X is not set
CONFIG_RTC_DRV_PPC=y
+CONFIG_RTC_DRV_GENERIC=y
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
CONFIG_ELECTRA_IDE=y
@@ -54,12 +55,13 @@ CONFIG_FB_OF=y
CONFIG_FB_IBM_GXT4500=y
CONFIG_FB_RADEON=y
CONFIG_FB_MATROX=y
-# CONFIG_FB_NVIDIA is not set
+CONFIG_FB_NVIDIA=y
# CONFIG_FB_VGA16 is not set
CONFIG_FB_ATY128_BACKLIGHT=y
CONFIG_FB_ATY_BACKLIGHT=y
CONFIG_FB_RADEON_BACKLIGHT=y
CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_NVIDIA_BACKLIGHT=y
CONFIG_SND_POWERMAC=m
CONFIG_SND_POWERMAC_AUTO_DRC=y
@@ -110,11 +112,14 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y
# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
# FIXME: Should depend on IA64/x86
# CONFIG_SGI_IOC4 is not set
CONFIG_PPC_EFIKA=y
+CONFIG_PPC_MEDIA5200=y
+
# CONFIG_PPC_LITE5200 is not set
CONFIG_PPC_BESTCOMM=y
CONFIG_PMAC_RACKMETER=m
@@ -197,6 +202,8 @@ CONFIG_EDAC=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_MM_EDAC=m
CONFIG_EDAC_PASEMI=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
CONFIG_AXON_RAM=m
CONFIG_OPROFILE_CELL=y
@@ -252,8 +259,10 @@ CONFIG_SERIO_XILINX_XPS_PS2=m
# CONFIG_PPC_SMLPAR is not set
CONFIG_MGCOGE=y
-### breaks usb on mac...? #486511
-# CONFIG_GEF_SBC610 is not set
+CONFIG_GEF_SBC610=y
+CONFIG_GEF_PPC9A=y
+CONFIG_GEF_SBC310=y
+
CONFIG_QUICC_ENGINE=y
CONFIG_QE_GPIO=y
CONFIG_MPC8xxx_GPIO=y
@@ -287,6 +296,8 @@ CONFIG_TOUCHSCREEN_DA9034=m
CONFIG_SIMPLE_GPIO=y
+CONFIG_FSL_PQ_MDIO=m
+
CONFIG_PS3_VRAM=m
CONFIG_MDIO_GPIO=m
CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
@@ -299,3 +310,13 @@ CONFIG_USB_FHCI_HCD=m
# CONFIG_FHCI_DEBUG is not set
# CONFIG_DRM_RADEON_KMS is not set
+
+CONFIG_AMIGAONE=y
+
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+
+CONFIG_DTL=y
+
+CONFIG_MMC_SDHCI_OF=m
+
+# CONFIG_CONSISTENT_SIZE_BOOL is not set
Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc64,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- config-powerpc64 12 Mar 2009 03:23:02 -0000 1.28
+++ config-powerpc64 25 Jul 2009 03:16:38 -0000 1.29
@@ -40,6 +40,7 @@ CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=
CONFIG_CBE_THERM=m
CONFIG_CBE_CPUFREQ=m
CONFIG_CBE_CPUFREQ_PMI=m
+CONFIG_CBE_CPUFREQ_PMI_ENABLE=y
CONFIG_PMAC_RACKMETER=m
CONFIG_IBMEBUS=y
CONFIG_SPU_FS=m
@@ -175,3 +176,7 @@ CONFIG_PPC_IBM_CELL_RESETBUTTON=y
CONFIG_PPC_IBM_CELL_POWERBUTTON=m
CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
+CONFIG_RTC_DRV_PS3=y
+
+CONFIG_CRASH_DUMP=y
+CONFIG_RELOCATABLE=y
Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-s390x,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- config-s390x 12 Mar 2009 03:23:03 -0000 1.12
+++ config-s390x 25 Jul 2009 03:16:38 -0000 1.13
@@ -5,6 +5,11 @@ CONFIG_MARCH_Z900=y
CONFIG_NR_CPUS=64
CONFIG_COMPAT=y
+# See bug 496596
+CONFIG_HZ_100=y
+# See bug 496605
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
CONFIG_MMU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -29,7 +34,7 @@ CONFIG_IPL=y
CONFIG_IPL_VM=y
# CONFIG_PROCESS_DEBUG is not set
CONFIG_PFAULT=y
-# CONFIG_SHARED_KERNEL is not set
+CONFIG_SHARED_KERNEL=y
CONFIG_CMM=m
CONFIG_CMM_PROC=y
CONFIG_VIRT_TIMER=y
@@ -40,7 +45,7 @@ CONFIG_SMSGIUCV=m
# SCSI low-level drivers
#
CONFIG_ZFCP=m
-CONFIG_ZFCPDUMP=m
+CONFIG_ZFCPDUMP=y
CONFIG_CCW=y
#
@@ -123,10 +128,6 @@ CONFIG_CCWGROUP=m
# CONFIG_IEEE80211 is not set
# CONFIG_B44 is not set
-# The s390 CPU does not have hardware support for big pages at all.
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-
#
# Partition Types
#
Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-sparc64-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- config-sparc64-generic 9 Apr 2009 19:15:20 -0000 1.25
+++ config-sparc64-generic 25 Jul 2009 03:16:38 -0000 1.26
@@ -151,7 +151,7 @@ CONFIG_ATM_FORE200E_USE_TASKLET=y
CONFIG_ATM_FORE200E_DEBUG=0
CONFIG_ATM_FORE200E_TX_RETRY=16
# CONFIG_DRM_TDFX is not set
-CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_ATKBD is not set
CONFIG_KEYBOARD_SUNKBD=y
# CONFIG_INPUT_PCSPKR is not set
CONFIG_INPUT_SPARCSPKR=m
@@ -197,5 +197,3 @@ CONFIG_US3_MC=y
CONFIG_SENSORS_ULTRA45=m
CONFIG_LEDS_SUNFIRE=m
CONFIG_TADPOLE_TS102_UCTRL=m
-
-# CONFIG_KGDB is not set
Index: config-sparc64-smp
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-sparc64-smp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- config-sparc64-smp 9 Apr 2009 19:15:20 -0000 1.3
+++ config-sparc64-smp 25 Jul 2009 03:16:38 -0000 1.4
@@ -1,2 +1 @@
CONFIG_SMP=y
-CONFIG_KGDB=y
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86-generic,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- config-x86-generic 13 Jun 2009 02:07:58 -0000 1.77
+++ config-x86-generic 25 Jul 2009 03:16:38 -0000 1.78
@@ -9,6 +9,9 @@ CONFIG_UID16=y
#
# CONFIG_X86_PC is not set
CONFIG_X86_GENERICARCH=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+CONFIG_X86_32_NON_STANDARD=y
+
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_NUMAQ is not set
@@ -67,6 +70,7 @@ CONFIG_SONYPI_COMPAT=y
CONFIG_MICROCODE=m
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
+CONFIG_X86_CPU_DEBUG=m
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
# CONFIG_NUMA is not set
@@ -83,6 +87,11 @@ CONFIG_EFI_PCDP=y
CONFIG_FB_EFI=y
# CONFIG_FB_N411 is not set
+CONFIG_DMAR=y
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+
CONFIG_FB_GEODE=y
CONFIG_FB_GEODE_LX=y
CONFIG_FB_GEODE_GX=y
@@ -100,6 +109,8 @@ CONFIG_PCMCIA_FDOMAIN=m
CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_SCSI_ADVANSYS=m
+CONFIG_CC_STACKPROTECTOR=y
+
CONFIG_SECCOMP=y
CONFIG_CAPI_EICON=y
@@ -291,6 +302,8 @@ CONFIG_EDAC_I5000=m
CONFIG_EDAC_I5100=m
CONFIG_EDAC_I5400=m
CONFIG_EDAC_R82600=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
CONFIG_SCHED_MC=y
@@ -323,6 +336,7 @@ CONFIG_ACPI_WMI=m
CONFIG_ACER_WMI=m
CONFIG_TC1100_WMI=m
CONFIG_HP_WMI=m
+CONFIG_DELL_WMI=m
# CONFIG_SMSC37B787_WDT is not set
CONFIG_W83697HF_WDT=m
@@ -350,6 +364,9 @@ CONFIG_LGUEST=m
CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_DEBUG is not set
+
+# PARAVIRT_SPINLOCKS has a 5% perf hit
+# CONFIG_PARAVIRT_SPINLOCKS is not set
CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
CONFIG_LGUEST_GUEST=y
@@ -384,6 +401,7 @@ CONFIG_THINKPAD_ACPI=m
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
CONFIG_MACINTOSH_DRIVERS=y
@@ -443,4 +461,3 @@ CONFIG_POWER_TRACER=y
CONFIG_HW_BRANCH_TRACER=y
# CONFIG_SPARSE_IRQ is not set
-CONFIG_SENSORS_VIA_CPUTEMP=m
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-x86_64-generic,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- config-x86_64-generic 13 Jun 2009 02:07:58 -0000 1.77
+++ config-x86_64-generic 25 Jul 2009 03:16:38 -0000 1.78
@@ -3,8 +3,12 @@ CONFIG_UID16=y
# CONFIG_MK8 is not set
# CONFIG_MPSC is not set
CONFIG_GENERIC_CPU=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_VSMP is not set
+# CONFIG_X86_UV is not set
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
+CONFIG_X86_CPU_DEBUG=m
CONFIG_MTRR=y
CONFIG_NUMA=y
CONFIG_K8_NUMA=y
@@ -28,10 +32,12 @@ CONFIG_EDD=m
CONFIG_PCI_BIOS=y
CONFIG_PCI_MMCONFIG=y
CONFIG_DMAR=y
-CONFIG_DMAR_GFX_WA=y
+# CONFIG_DMAR_GFX_WA is not set
CONFIG_DMAR_FLOPPY_WA=y
# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_KEXEC_JUMP=y
+
CONFIG_EFI=y
CONFIG_EFI_VARS=y
CONFIG_EFI_PCDP=y
@@ -113,6 +119,7 @@ CONFIG_DELL_LAPTOP=m
CONFIG_ACPI_WMI=m
CONFIG_ACER_WMI=m
CONFIG_HP_WMI=m
+CONFIG_DELL_WMI=m
CONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUG is not set
@@ -120,6 +127,7 @@ CONFIG_THINKPAD_ACPI=m
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -147,14 +155,15 @@ CONFIG_PNPACPI=y
CONFIG_BLK_DEV_AMD74XX=y
CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=y
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=y
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
# CONFIG_CRYPTO_AES is not set
CONFIG_CRYPTO_AES_X86_64=m
# CONFIG_CRYPTO_TWOFISH is not set
CONFIG_CRYPTO_TWOFISH_X86_64=m
# CONFIG_CRYPTO_SALSA20 is not set
CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
@@ -196,6 +205,8 @@ CONFIG_EDAC_I82875P=m
CONFIG_EDAC_I82860=m
CONFIG_EDAC_I82975X=m
CONFIG_EDAC_R82600=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
CONFIG_SCHED_MC=y
@@ -272,6 +283,8 @@ CONFIG_KVM_TRACE=y
CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_DEBUG is not set
+# PARAVIRT_SPINLOCKS has a 5% perf hit
+# CONFIG_PARAVIRT_SPINLOCKS is not set
CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
@@ -349,7 +362,6 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=
CONFIG_POWER_TRACER=y
CONFIG_HW_BRANCH_TRACER=y
+CONFIG_X86_X2APIC=y
CONFIG_SPARSE_IRQ=y
CONFIG_NUMA_MIGRATE_IRQ_DESC=y
-
-CONFIG_SENSORS_VIA_CPUTEMP=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1680
retrieving revision 1.1681
diff -u -p -r1.1680 -r1.1681
--- kernel.spec 25 Jul 2009 01:43:18 -0000 1.1680
+++ kernel.spec 25 Jul 2009 03:16:38 -0000 1.1681
@@ -412,9 +412,6 @@ Summary: The Linux kernel
#
%define kernel_xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
-# upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise
-# now that the smp kernel offers this capability, obsolete the old kernel
-%define kernel_smp_obsoletes kernel-enterprise < 2.4.10
%define kernel_PAE_obsoletes kernel-smp < 2.6.17, kernel-xen <= 2.6.27-0.2.rc0.git6.fc10
%define kernel_PAE_provides kernel-xen = %{rpmversion}-%{pkg_release}
@@ -589,30 +586,15 @@ Patch09: linux-2.6-upstream-reverts.patc
# Git trees.
Patch10: git-cpufreq.patch
Patch11: git-bluetooth.patch
-Patch12: git-bluetooth-fixes.patch
# Standalone patches
Patch20: linux-2.6-hotfixes.patch
Patch21: linux-2.6-tracehook.patch
Patch22: linux-2.6-utrace.patch
-Patch23: linux-2.6-utrace-ftrace.patch
-
-# vm patches
-Patch24: linux-2.6-defaults-saner-vm-settings.patch
-Patch25: linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
-Patch26: linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
-Patch27: linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
-
-# Support suspend/resume, other crash fixes
-Patch30: linux-2.6-iommu-fixes.patch
Patch41: linux-2.6-sysrq-c.patch
-#Patch101: linux-2.6-e820-save-restore-edi-ebp.patch
-#Patch102: linux-2.6-e820-acpi3-bios-workaround.patch
-#Patch103: linux-2.6-e820-guard-against-pre-acpi3.patch
-
Patch141: linux-2.6-ps3-storage-alias.patch
Patch143: linux-2.6-g5-therm-shutdown.patch
Patch144: linux-2.6-vio-modalias.patch
@@ -621,6 +603,9 @@ Patch147: linux-2.6-imac-transparent-bri
Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
Patch160: linux-2.6-execshield.patch
+
+Patch200: linux-2.6-ext4-prealloc-fixes.patch
+
Patch250: linux-2.6-debug-sizeof-structs.patch
Patch260: linux-2.6-debug-nmi-timeout.patch
Patch270: linux-2.6-debug-taint-vm.patch
@@ -630,65 +615,25 @@ Patch360: linux-2.6-debug-always-inline-
Patch380: linux-2.6-defaults-pci_no_msi.patch
Patch381: linux-2.6-pciehp-update.patch
Patch382: linux-2.6-defaults-pciehp.patch
-Patch383: linux-2.6-pci-sysfs-remove-id.patch
Patch390: linux-2.6-defaults-acpi-video.patch
Patch391: linux-2.6-acpi-video-dos.patch
-Patch392: linux-2.6-acpi-strict-resources.patch
-Patch393: linux-2.6-hwmon-atk0110.patch
-Patch394: linux-2.6-acpi-video-didl-intel-outputs.patch
-Patch395: linux-2.6-sony-laptop-rfkill.patch
-Patch400: linux-2.6-scsi-cpqarray-set-master.patch
Patch450: linux-2.6-input-kill-stupid-messages.patch
Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
-Patch452: linux-2.6-input-hid-extra-gamepad.patch
-Patch453: linux-2.6-input-wacom-bluetooth.patch
-Patch455: linux-2.6-input-bcm5974-new-header-type.patch
-Patch456: linux-2.6-input-bcm5974-add-quad-finger.patch
-Patch457: linux-2.6-input-bcm5974-add-macbook-unibody.patch
-Patch458: linux-2.6-hid-apple-mini-keyboard.patch
-
-Patch470: linux-2.6-serial-460800.patch
-Patch471: linux-2.6-serial-add-txen-test-param.patch
-Patch472: linux-2.6-drivers-char-low-latency-removal.patch
-# 8192 too low
-Patch480: increase-MAX_LOCKDEP_ENTRIES.patch
+Patch460: linux-2.6-serial-460800.patch
Patch510: linux-2.6-silence-noise.patch
-Patch511: linux-2.6-shut-up-efifb.patch
Patch530: linux-2.6-silence-fbcon-logo.patch
Patch570: linux-2.6-selinux-mprotect-checks.patch
Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
+
Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch601: alsa-rewrite-hw_ptr-updaters.patch
-Patch602: alsa-pcm-always-reset-invalid-position.patch
-Patch603: alsa-pcm-fix-delta-calc-at-overlap.patch
-Patch605: alsa-hda-dont-reset-BDL-unnecessarily.patch
-Patch606: alsa-dont-reset-stream-at-each-prepare-callb.patch
-Patch607: alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
-Patch608: alsa-pcm-safer-boundary-checks.patch
Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
-Patch611: linux-2.6.29-alsa-update-quirks.patch
-Patch612: alsa-hda-add-debugging.patch
-
-Patch630: net-revert-forcedeth-power-down-phy-when-interface-is.patch
-Patch642: linux-2.6-netdev-r8169-use-different-family-defaults.patch
Patch670: linux-2.6-ata-quirk.patch
Patch680: linux-2.6-rt2x00-asus-leds.patch
Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
-Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
-Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
-Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
-Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
-Patch686: linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch
-Patch687: mac80211-don-t-drop-nullfunc-frames-during-software.patch
-Patch690: iwl3945-release-resources-before-shutting-down.patch
-Patch691: iwl3945-add-debugging-for-wrong-command-queue.patch
-Patch692: iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
-
-Patch700: linux-2.6-dma-debug-fixes.patch
Patch800: linux-2.6-crash-driver.patch
@@ -696,10 +641,6 @@ Patch1000: linux-2.6-neigh_-fix-state-tr
Patch1515: linux-2.6.29-lirc.patch
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-Patch1550: linux-2.6-cdrom-door-status.patch
-
Patch1700: agp-set_memory_ucwb.patch
# nouveau + drm fixes
Patch1811: drm-next.patch
@@ -709,40 +650,9 @@ Patch1814: drm-nouveau.patch
Patch1816: drm-no-gem-on-i8xx.patch
Patch1818: drm-i915-resume-force-mode.patch
Patch1819: drm-intel-big-hammer.patch
-Patch1821: drm-intel-lying-systems-without-lvds.patch
-Patch1822: drm-intel-gen3-fb-hack.patch
-Patch1824: drm-intel-hdmi-edid-fix.patch
-Patch1825: drm-intel-tiling-transition.patch
-Patch1826: drm-intel-next.patch
-Patch1828: drm-intel-debugfs-ringbuffer.patch
-Patch1829: drm-edid-ignore-tiny-modes.patch
-Patch1830: linux-2.6.29.3-boot-vga.patch
-Patch1831: drm-intel-include-965gme-pci-id.patch
-Patch1832: drm-intel-gem-use-dma32-on-pae.patch
-Patch1833: drm-intel-i8xx-cursors.patch
-Patch1834: drm-intel-vmalloc.patch
-Patch1835: drm-copyback-ioctl-data-to-userspace-regardless-of-retcode.patch
-Patch1836: drm-intel-disable-kms-i8xx.patch
-Patch1837: drm-i915-apply-a-big-hammer-to-865-gem-object.patch
-Patch1838: drm-i915-fix-tiling-pitch.patch
-Patch1839: drm-intel-set-domain-on-fault.patch
-Patch1840: drm-modesetting-radeon-fixes.patch
-Patch1841: drm-radeon-fix-ring-commit.patch
-Patch1842: drm-radeon-new-pciids.patch
-Patch1843: drm-dont-frob-i2c.patch
-Patch1844: drm-connector-dpms-fix.patch
-Patch1845: drm-intel-tv-fix.patch
-Patch1846: drm-radeon-cs-oops-fix.patch
-Patch1847: drm-intel-a17-fix.patch
-Patch1848: drm-pnp-add-resource-range-checker.patch
-Patch1849: drm-i915-enable-mchbar.patch
# kludge to make ich9 e1000 work
Patch2000: linux-2.6-e1000-ich9.patch
-# BZ #498854
-Patch2010: linux-2.6-netdev-ehea-fix-circular-locking.patch
-Patch2012: linux-2.6-netdev-ehea-fix-page-alignment.patch
-Patch2013: linux-2.6-netdev-ehea-remove-from-list.patch
# linux1394 git patches
Patch2200: linux-2.6-firewire-git-update.patch
@@ -752,62 +662,27 @@ Patch2201: linux-2.6-firewire-git-pendin
# silence the ACPI blacklist code
Patch2802: linux-2.6-silence-acpi-blacklist.patch
-Patch2900: linux-2.6-v4l-dvb-fixes.patch
+Patch2899: linux-2.6-v4l-dvb-fixes.patch
+Patch2900: linux-2.6-v4l-dvb-update.patch
Patch2901: linux-2.6-v4l-dvb-experimental.patch
-Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
# fs fixes
-# ext4 fixes
+Patch3000: linux-2.6-btrfs-experimental-branch.patch
+
+#snmp fixes
+Patch10000: linux-2.6-missing-rfc2465-stats.patch
-Patch3000: linux-2.6-btrfs-unstable-update.patch
-Patch3010: linux-2.6-relatime-by-default.patch
-Patch3020: linux-2.6-fiemap-header-install.patch
-
-Patch5000: linux-2.6-add-qcserial.patch
-
-# patches headed for -stable
-# fix squashfs on systems where pagesize > blocksize (ia64, ppc64 w/64k pages)
-Patch6010: squashfs-broken-when-pagesize-greater-than-blocksize.patch
-
-# CIFS
-Patch6100: linux-2.6-fs-cifs-fix-port-numbers.patch
-
-Patch9001: revert-fix-modules_install-via-nfs.patch
-Patch9010: linux-2.6-nfsd-report-short-writes.patch
-Patch9020: linux-2.6-nfsd-report-short-writes-fix.patch
-Patch9030: linux-2.6-nfsd-cred-refcount-fix.patch
-
-Patch9100: cpufreq-add-atom-to-p4-clockmod.patch
-# VIA processors: enable pstates
-Patch9110: linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
-
-#Adding dropwatch into rawhide until we get to 2.6.30
-Patch9200: linux-2.6-dropwatch-protocol.patch
-
-# kvm fixes
-Patch9303: linux-2.6-kvm-skip-pit-check.patch
-Patch9304: linux-2.6-xen-check-for-nx-support.patch
-Patch9305: linux-2.6-xen-fix_warning_when_deleting_gendisk.patch
-Patch9307: linux-2.6.29-xen-disable-gbpages.patch
-Patch9308: linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
-
-Patch11000: linux-2.6-parport-quickfix-the-proc-registration-bug.patch
-Patch11010: linux-2.6-dev-zero-avoid-oom-lockup.patch
-Patch11020: linux-2.6-usb-remove-low-latency-hack.patch
-Patch11030: linux-2.6-x86-delay-tsc-barrier.patch
-
-# via: enable 64-bit padlock support on nano, add CPU temp sensor,
-# add via-sdmmc driver
-Patch11100: via-centaur-merge-32-64-bit-init.patch
-Patch11105: via-sdmmc.patch
-Patch11106: via-rng-64-bit-enable.patch
-Patch11107: via-padlock-nano-workarounds-ecb.patch
-Patch11108: via-padlock-nano-workarounds-cbc.patch
-Patch11109: via-padlock-cryptodev-1-64bit-enable.patch
-Patch11110: via-padlock-cryptodev-2-64bit-enable.patch
-Patch11120: via-padlock-fix-might-sleep.patch
-Patch11130: via-hwmon-temp-sensor.patch
+# VIA Nano / VX8xx updates
+Patch11000: linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
+Patch11010: via-hwmon-temp-sensor.patch
+Patch11020: via-padlock-10-enable-64bit.patch
+Patch11030: via-padlock-20-add-x86-dependency.patch
+Patch11040: via-padlock-30-fix-might-sleep.patch
+Patch11050: via-padlock-40-nano-ecb.patch
+Patch11060: via-padlock-50-nano-cbc.patch
+Patch11070: via-rng-enable-64bit.patch
+Patch11080: via-sdmmc.patch
%endif
@@ -865,11 +740,10 @@ Requires: gzip
Kernel-bootwrapper contains the wrapper code which makes bootable "zImage"
files combining both kernel and initial ramdisk.
-%package debuginfo-common
+%package debuginfo-common-%{_target_cpu}
Summary: Kernel source files used by %{name}-debuginfo packages
Group: Development/Debug
-Provides: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
-%description debuginfo-common
+%description debuginfo-common-%{_target_cpu}
This package is required by %{name}-debuginfo subpackages.
It provides the kernel source files common to all builds.
@@ -1033,6 +907,20 @@ ApplyPatch()
esac
}
+# don't apply patch if it's empty
+ApplyOptionalPatch()
+{
+ local patch=$1
+ shift
+ if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+ exit 1
+ fi
+ local C=$(wc -l $RPM_SOURCE_DIR/$patch | awk '{print $1}')
+ if [ "$C" -gt 9 ]; then
+ ApplyPatch $patch ${1+"$@"}
+ fi
+}
+
# First we unpack the kernel tarball.
# If this isn't the first make prep, we use links to the existing clean tarball
# which speeds things up quite a bit.
@@ -1172,7 +1060,7 @@ make -f %{SOURCE20} VERSION=%{version} c
done
%endif
-#ApplyPatch git-linus.diff
+#ApplyOptionalPatch git-linus.diff
# This patch adds a "make nonint_oldconfig" which is non-interactive and
# also gives a list of missing options at the end. Useful for automated
@@ -1184,47 +1072,38 @@ ApplyPatch linux-2.6-makefile-after_link
#
# misc small stuff to make things compile
#
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-compile-fixes.patch
-fi
+ApplyOptionalPatch linux-2.6-compile-fixes.patch
%if !%{nopatches}
# revert patches from upstream that conflict or that we get via other means
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-upstream-reverts.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-upstream-reverts.patch -R
-fi
+ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
#ApplyPatch git-cpufreq.patch
-ApplyPatch git-bluetooth.patch
-ApplyPatch git-bluetooth-fixes.patch
+#ApplyPatch git-bluetooth.patch
ApplyPatch linux-2.6-hotfixes.patch
# Roland's utrace ptrace replacement.
ApplyPatch linux-2.6-tracehook.patch
ApplyPatch linux-2.6-utrace.patch
-ApplyPatch linux-2.6-utrace-ftrace.patch
-
-# vm patches
-ApplyPatch linux-2.6-defaults-saner-vm-settings.patch
-ApplyPatch linux-2.6-mm-lru-evict-streaming-io-pages-first.patch
-ApplyPatch linux-2.6-mm-lru-report-vm-flags-in-page-referenced.patch
-ApplyPatch linux-2.6-mm-lru-dont-evict-mapped-executable-pages.patch
-
-# IOMMU fixes backported to 2.6.29
-ApplyPatch linux-2.6-iommu-fixes.patch
# enable sysrq-c on all kernels, not only kexec
ApplyPatch linux-2.6-sysrq-c.patch
+ApplyPatch linux-2.6-missing-rfc2465-stats.patch
+
# Architecture patches
# x86(-64)
-#ApplyPatch linux-2.6-e820-save-restore-edi-ebp.patch
-#ApplyPatch linux-2.6-e820-acpi3-bios-workaround.patch
-#ApplyPatch linux-2.6-e820-guard-against-pre-acpi3.patch
+ApplyPatch linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
+ApplyPatch via-hwmon-temp-sensor.patch
+ApplyPatch via-padlock-10-enable-64bit.patch
+ApplyPatch via-padlock-20-add-x86-dependency.patch
+ApplyPatch via-padlock-30-fix-might-sleep.patch
+ApplyPatch via-padlock-40-nano-ecb.patch
+ApplyPatch via-padlock-50-nano-cbc.patch
+ApplyPatch via-rng-enable-64bit.patch
+ApplyPatch via-sdmmc.patch
#
# PowerPC
@@ -1244,8 +1123,8 @@ ApplyPatch linux-2.6-imac-transparent-br
#
# SPARC64
#
-
ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
+
#
# Exec shield
#
@@ -1256,33 +1135,23 @@ ApplyPatch linux-2.6-execshield.patch
#
# ext4
+#ApplyPatch linux-2.6-ext4-prealloc-fixes.patch
# xfs
# btrfs
-ApplyPatch linux-2.6-btrfs-unstable-update.patch
-
-# relatime
-ApplyPatch linux-2.6-relatime-by-default.patch
-
-# put fiemap.h into kernel-headers
-ApplyPatch linux-2.6-fiemap-header-install.patch
+#ApplyPatch linux-2.6-btrfs-experimental-branch.patch
# USB
-ApplyPatch linux-2.6-add-qcserial.patch
# ACPI
ApplyPatch linux-2.6-defaults-acpi-video.patch
ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acpi-strict-resources.patch
-ApplyPatch linux-2.6-hwmon-atk0110.patch
-ApplyPatch linux-2.6-acpi-video-didl-intel-outputs.patch
-ApplyPatch linux-2.6-sony-laptop-rfkill.patch
# Various low-impact patches to aid debugging.
ApplyPatch linux-2.6-debug-sizeof-structs.patch
-ApplyPatch linux-2.6-debug-nmi-timeout.patch
-ApplyPatch linux-2.6-debug-taint-vm.patch
+#ApplyPatch linux-2.6-debug-nmi-timeout.patch
+#ApplyPatch linux-2.6-debug-taint-vm.patch
ApplyPatch linux-2.6-debug-spinlock-taint.patch
ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
@@ -1296,36 +1165,17 @@ ApplyPatch linux-2.6-defaults-pci_no_msi
#ApplyPatch linux-2.6-pciehp-update.patch
# default to enabling passively listening for hotplug events
#ApplyPatch linux-2.6-defaults-pciehp.patch
-# Add /sys/bus/pci/devices/*/remove_id
-ApplyPatch linux-2.6-pci-sysfs-remove-id.patch
#
# SCSI Bits.
#
-# fix cpqarray pci enable
-ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
# ALSA
# squelch hda_beep by default
ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-ApplyPatch linux-2.6.29-alsa-update-quirks.patch
-
-# fix alsa for pulseaudio
-ApplyPatch alsa-rewrite-hw_ptr-updaters.patch
-ApplyPatch alsa-pcm-always-reset-invalid-position.patch
-ApplyPatch alsa-pcm-fix-delta-calc-at-overlap.patch
-ApplyPatch alsa-hda-dont-reset-BDL-unnecessarily.patch
-ApplyPatch alsa-dont-reset-stream-at-each-prepare-callb.patch
-ApplyPatch alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch
-ApplyPatch alsa-pcm-safer-boundary-checks.patch
ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
-ApplyPatch alsa-hda-add-debugging.patch
# Networking
-ApplyPatch net-revert-forcedeth-power-down-phy-when-interface-is.patch
-
-# r8169 fixes from 2.6.30
-ApplyPatch linux-2.6-netdev-r8169-use-different-family-defaults.patch
# Misc fixes
# The input layer spews crap no-one cares about.
@@ -1334,42 +1184,19 @@ ApplyPatch linux-2.6-input-kill-stupid-m
# Get away from having to poll Toshibas
ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
-# HID: add support for another version of 0e8f:0003 device in hid-pl
-ApplyPatch linux-2.6-input-hid-extra-gamepad.patch
-
-# HID: add support for Bluetooth Wacom pads
-ApplyPatch linux-2.6-input-wacom-bluetooth.patch
-
-# bcm5974: macbook 5 (unibody) support
-ApplyPatch linux-2.6-input-bcm5974-new-header-type.patch
-ApplyPatch linux-2.6-input-bcm5974-add-quad-finger.patch
-ApplyPatch linux-2.6-input-bcm5974-add-macbook-unibody.patch
-
-# support apple mini keyboard (#507517)
-ApplyPatch linux-2.6-hid-apple-mini-keyboard.patch
-
# Allow to use 480600 baud on 16C950 UARTs
ApplyPatch linux-2.6-serial-460800.patch
-# let users skip the TXEN bug test
-ApplyPatch linux-2.6-serial-add-txen-test-param.patch
-# fix oops in nozomi drver (#507005) plus two others
-ApplyPatch linux-2.6-drivers-char-low-latency-removal.patch
-
-ApplyPatch increase-MAX_LOCKDEP_ENTRIES.patch
# Silence some useless messages that still get printed with 'quiet'
ApplyPatch linux-2.6-silence-noise.patch
-# Avoid efifb spew
-ApplyPatch linux-2.6-shut-up-efifb.patch
-
# Make fbcon not show the penguins with 'quiet'
ApplyPatch linux-2.6-silence-fbcon-logo.patch
# Fix the SELinux mprotect checks on executable mappings
-ApplyPatch linux-2.6-selinux-mprotect-checks.patch
+#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
# Fix SELinux for sparc
-ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
+#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
# Changes to upstream defaults.
@@ -1378,28 +1205,10 @@ ApplyPatch linux-2.6-sparc-selinux-mprot
ApplyPatch linux-2.6-ata-quirk.patch
# rt2x00: back-port activity LED init patches
-ApplyPatch linux-2.6-rt2x00-asus-leds.patch
+#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
# back-port scan result aging patches
-ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
-
-# back-port iwlwifi rfkill while device down patches
-ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
-ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
-ApplyPatch linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch
-
-# back-port mac80211: fix beacon loss detection after scan
-ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
-
-ApplyPatch mac80211-don-t-drop-nullfunc-frames-during-software.patch
-
-ApplyPatch iwl3945-release-resources-before-shutting-down.patch
-ApplyPatch iwl3945-add-debugging-for-wrong-command-queue.patch
-ApplyPatch iwl3945-fix-rfkill-sw-and-hw-mishmash.patch
-
-# Fix up DMA debug code
-ApplyPatch linux-2.6-dma-debug-fixes.patch
+#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
# /dev/crash driver.
ApplyPatch linux-2.6-crash-driver.patch
@@ -1410,118 +1219,31 @@ ApplyPatch linux-2.6-neigh_-fix-state-tr
# http://www.lirc.org/
ApplyPatch linux-2.6.29-lirc.patch
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-ApplyPatch linux-2.6-cdrom-door-status.patch
-
ApplyPatch linux-2.6-e1000-ich9.patch
-# bz 498854
-ApplyPatch linux-2.6-netdev-ehea-fix-circular-locking.patch
-ApplyPatch linux-2.6-netdev-ehea-fix-page-alignment.patch
-ApplyPatch linux-2.6-netdev-ehea-remove-from-list.patch
ApplyPatch agp-set_memory_ucwb.patch
# Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
-ApplyPatch drm-modesetting-radeon.patch
-ApplyPatch drm-nouveau.patch
+#ApplyPatch drm-next.patch
+#ApplyPatch drm-modesetting-radeon.patch
+#ApplyPatch drm-nouveau.patch
# pm broken on my thinkpad t60p - airlied
#ApplyPatch drm-radeon-pm.patch
ApplyPatch drm-no-gem-on-i8xx.patch
ApplyPatch drm-i915-resume-force-mode.patch
ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-intel-lying-systems-without-lvds.patch
-ApplyPatch drm-intel-gen3-fb-hack.patch
-ApplyPatch drm-intel-hdmi-edid-fix.patch
-ApplyPatch drm-intel-tiling-transition.patch
-ApplyPatch drm-intel-next.patch
-ApplyPatch drm-intel-debugfs-ringbuffer.patch
-ApplyPatch drm-edid-ignore-tiny-modes.patch
-ApplyPatch drm-intel-include-965gme-pci-id.patch
-ApplyPatch linux-2.6.29.3-boot-vga.patch
-ApplyPatch drm-intel-gem-use-dma32-on-pae.patch
-ApplyPatch drm-intel-i8xx-cursors.patch
-ApplyPatch drm-intel-vmalloc.patch
-ApplyPatch drm-copyback-ioctl-data-to-userspace-regardless-of-retcode.patch
-# These should be fixed with the fix-tiling patch
-# ApplyPatch drm-intel-disable-kms-i8xx.patch
-ApplyPatch drm-i915-apply-a-big-hammer-to-865-gem-object.patch
-ApplyPatch drm-i915-fix-tiling-pitch.patch
-ApplyPatch drm-intel-set-domain-on-fault.patch
-ApplyPatch drm-modesetting-radeon-fixes.patch
-ApplyPatch drm-radeon-fix-ring-commit.patch
-ApplyPatch drm-radeon-new-pciids.patch
-ApplyPatch drm-dont-frob-i2c.patch
-ApplyPatch drm-connector-dpms-fix.patch
-ApplyPatch drm-intel-tv-fix.patch
-ApplyPatch drm-radeon-cs-oops-fix.patch
-ApplyPatch drm-intel-a17-fix.patch
-ApplyPatch drm-pnp-add-resource-range-checker.patch
-ApplyPatch drm-i915-enable-mchbar.patch
# linux1394 git patches
-ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-#if [ "$C" -gt 10 ]; then
-#ApplyPatch linux-2.6-firewire-git-pending.patch
-#fi
+#ApplyPatch linux-2.6-firewire-git-update.patch
+#ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
# silence the ACPI blacklist code
ApplyPatch linux-2.6-silence-acpi-blacklist.patch
# V4L/DVB updates/fixes/experimental drivers
-ApplyPatch linux-2.6-v4l-dvb-fixes.patch
-ApplyPatch linux-2.6-v4l-dvb-experimental.patch
-ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
-ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
-
-# revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
-ApplyPatch revert-fix-modules_install-via-nfs.patch
-
-ApplyPatch linux-2.6-dropwatch-protocol.patch
-
-# patches headed for -stable
-ApplyPatch squashfs-broken-when-pagesize-greater-than-blocksize.patch
-
-# fix nfs reporting of short writes (#493500)
-ApplyPatch linux-2.6-nfsd-report-short-writes.patch
-# fix the short write fix (#508174)
-ApplyPatch linux-2.6-nfsd-report-short-writes-fix.patch
-# Fix null credential bug (#494067)
-ApplyPatch linux-2.6-nfsd-cred-refcount-fix.patch
-
-# fix cifs mount option "port=" (#506574)
-ApplyPatch linux-2.6-fs-cifs-fix-port-numbers.patch
-
-# cpufreq
-ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
-ApplyPatch linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
-# kvm fixes
-ApplyPatch linux-2.6-kvm-skip-pit-check.patch
-ApplyPatch linux-2.6-xen-check-for-nx-support.patch
-ApplyPatch linux-2.6-xen-fix_warning_when_deleting_gendisk.patch
-ApplyPatch linux-2.6.29-xen-disable-gbpages.patch
-# http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=4eff3cae9c9809720c636e64bc72f212258e0bd5 (#510304)
-ApplyPatch linux-2.6-virtio_blk-dont-bounce-highmem-requests.patch
-# finally fix the proc registration bug (F11#503773 and others)
-ApplyPatch linux-2.6-parport-quickfix-the-proc-registration-bug.patch
-#
-ApplyPatch linux-2.6-dev-zero-avoid-oom-lockup.patch
-# fix oopses in usb serial devices (#500954)
-ApplyPatch linux-2.6-usb-remove-low-latency-hack.patch
-
-ApplyPatch linux-2.6-x86-delay-tsc-barrier.patch
-
-# VIA: add 64-bit padlock support, sdmmc driver, temp sensor driver
-ApplyPatch via-centaur-merge-32-64-bit-init.patch
-ApplyPatch via-padlock-fix-might-sleep.patch
-ApplyPatch via-padlock-cryptodev-1-64bit-enable.patch
-ApplyPatch via-padlock-cryptodev-2-64bit-enable.patch
-ApplyPatch via-padlock-nano-workarounds-ecb.patch
-ApplyPatch via-padlock-nano-workarounds-cbc.patch
-ApplyPatch via-sdmmc.patch
-ApplyPatch via-rng-64-bit-enable.patch
-ApplyPatch via-hwmon-temp-sensor.patch
+#ApplyPatch linux-2.6-v4l-dvb-fixes.patch
+#ApplyPatch linux-2.6-v4l-dvb-update.patch
+#ApplyPatch linux-2.6-v4l-dvb-experimental.patch
+#ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
# END OF PATCH APPLICATIONS
@@ -1825,8 +1547,7 @@ BuildKernel vmlinux vmlinux kdump vmlinu
%if %{with_doc}
# Make the HTML and man pages.
-make htmldocs || %{doc_build_fail}
-make %{?_smp_mflags} mandocs || %{doc_build_fail}
+make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
# sometimes non-world-readable files sneak into the kernel source tree
chmod -R a=rX Documentation
@@ -1849,7 +1570,7 @@ find Documentation -type d | xargs chmod
%if %{with_debuginfo}
%ifnarch noarch
%global __debug_package 1
-%files -f debugfiles.list debuginfo-common
+%files -f debugfiles.list debuginfo-common-%{_target_cpu}
%defattr(-,root,root)
%endif
%endif
@@ -2110,6 +1831,10 @@ fi
%changelog
* Fri Jul 24 2009 Kyle McMartin <kyle at redhat.com>
+- Copy over release configs from devel-2.6.30 tag.
+- Fix up some spec deviations.
+
+* Fri Jul 24 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.30.3 rebase for Fedora 11.
- Fedora 11 2.6.29 branch is on tag private-fedora-11-2_6_29_6.
More information about the fedora-extras-commits
mailing list