Bring in Linux-3.1-rc2

2011-08-16 10:32:18 -04:00 · 2011-08-16 10:32:18 -04:00 · 9765980dfc
parent 0ffe7fc9b0
commit 9765980dfc
30 changed files with 2471 additions and 2263 deletions
--- a/Makefile.config
+++ b/Makefile.config
@ -39,16 +39,22 @@ temp-arm-generic: config-arm-generic temp-generic
 temp-armv7l-omap-generic: config-arm-omap-generic temp-arm-generic
 	perl merge.pl $^  > $@

-temp-x86-generic: config-x86-generic temp-generic
+temp-x86-32: config-x86-32-generic config-x86-generic
 	perl merge.pl $^  > $@

-temp-x86-debug-generic: config-x86-generic temp-debug-generic
+temp-x86-32-generic: temp-x86-32 temp-generic
 	perl merge.pl $^  > $@

-temp-x86_64-generic: config-x86_64-generic temp-generic
+temp-x86-debug-generic: temp-x86-32 temp-debug-generic
 	perl merge.pl $^  > $@

-temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic
+temp-x86-64: config-x86_64-generic config-x86-generic
+	perl merge.pl $^  > $@
+
+temp-x86_64-generic: temp-x86-64 temp-generic
+	perl merge.pl $^  > $@
+
+temp-x86_64-debug-generic: temp-x86-64 temp-debug-generic
 	perl merge.pl $^  > $@

 temp-sparc64-generic: config-sparc64-generic temp-generic
@ -69,13 +75,13 @@ temp-s390-generic: config-s390x temp-generic
 temp-ia64-generic: config-ia64-generic temp-generic
 	perl merge.pl $^ > $@

-kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-generic
+kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-32-generic
 	perl merge.pl $^ i386 > $@

 kernel-$(VERSION)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic
 	perl merge.pl $^ i386 > $@

-kernel-$(VERSION)-i686.config: /dev/null temp-x86-generic
+kernel-$(VERSION)-i686.config: /dev/null temp-x86-32-generic
 	perl merge.pl $^ i386 > $@

 kernel-$(VERSION)-i686-debug.config: /dev/null temp-x86-debug-generic
--- a/add-appleir-usb-driver.patch
+++ b/add-appleir-usb-driver.patch
@ -140,9 +140,8 @@ diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
 index 60de906..2f2f2e7 100644
 --- a/drivers/input/misc/Kconfig
 +++ b/drivers/input/misc/Kconfig
-@@ -209,6 +209,19 @@ config INPUT_KEYSPAN_REMOTE
- 	  To compile this driver as a module, choose M here: the module will
- 	  be called keyspan_remote.
+ 	help
+ 	  Say Y here if you need accelerometer to work in polling mode.
 
 +config INPUT_APPLEIR
 +	tristate "Apple infrared receiver (built in)"
--- a/5
+++ b/5
@ -9,6 +9,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_MACH_VERSATILE_AB=y
+CONFIG_MACH_VERSATILE_DT=y

 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
@ -146,6 +147,8 @@ CONFIG_USE_OF=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_MTD_PHYSMAP_OF=m
 CONFIG_SERIAL_OF_PLATFORM=m
-# CONFIG_LEDS_GPIO_OF is not set
 CONFIG_MMC_SDHCI_OF=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MMC_SDHCI_PXAV2=m

+CONFIG_FTGMAC100=m
--- a/9
+++ b/9
@ -275,6 +275,7 @@ CONFIG_TI_DAC7512=m
 CONFIG_BMP085=m
 CONFIG_C2PORT=m
 CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_93XX46=m
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_BLK_DEV_SR_VENDOR is not set
@ -387,6 +388,7 @@ CONFIG_INPUT_AD714X_SPI=m
 # CONFIG_INPUT_APPLEIR is not set
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 CONFIG_INPUT_TWL4030_VIBRA=y
+CONFIG_INPUT_TWL6040_VIBRA=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 CONFIG_INPUT_ADXL34X=m
@ -445,6 +447,7 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_GENERIC_PLATFORM is not set

 #
 # Memory mapped GPIO expanders:
@ -568,6 +571,7 @@ CONFIG_OMAP_WATCHDOG=y
 CONFIG_SSB=y
 # CONFIG_SSB_SDIOHOST is not set
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_ASIC3 is not set
@ -597,6 +601,8 @@ CONFIG_TWL4030_CODEC=y
 CONFIG_MFD_OMAP_USB_HOST=y
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_WL1273_CORE is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
@ -640,6 +646,7 @@ CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_ADP1653=m
 #
 # CONFIG_VIDEO_TVAUDIO is not set
 # CONFIG_VIDEO_TDA7432 is not set
@ -736,6 +743,7 @@ CONFIG_PANEL_TPO_TD043MTEA1=y
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_AMS369FG06 is not set
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
@ -790,6 +798,7 @@ CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
 CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
 CONFIG_SND_OMAP_SOC_ZOOM2=y
 CONFIG_SND_OMAP_SOC_IGEP0020=y
+CONFIG_SND_OMAP_SOC_OMAP4_HDMI=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_TLV320AIC23=y
--- a/2
+++ b/2
@ -2,6 +2,8 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y

+CONFIG_DEBUG_ATOMIC_SLEEP=y
+
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_LOCK_ALLOC=y
--- a/53
+++ b/53
@ -528,6 +528,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT2SAS_LOGGING=y
@ -734,6 +735,10 @@ CONFIG_FIREWIRE_NOSY=m
 # CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set

 #
+# Virtualization support drivers
+#
+# CONFIG_VIRT_DRIVERS is not set
+
 # Networking support
 #
 CONFIG_NET=y
@ -1041,6 +1046,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m

 #
@ -1345,6 +1351,7 @@ CONFIG_R8169=m
 CONFIG_R8169_VLAN=y
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
@ -1470,6 +1477,7 @@ CONFIG_ATMEL=m
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA=y
 CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
@ -1583,6 +1591,7 @@ CONFIG_WL1271_SPI=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192CU=m
+CONFIG_RTL8192DE=m

 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
@ -1663,6 +1672,8 @@ CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m

+CONFIG_NFC=m
+
 #
 # IrDA (infrared) support
 #
@ -2033,6 +2044,10 @@ CONFIG_INPUT_APPLEIR=m

 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_PCF8574 is not set
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set

 #
 # Character devices
@ -2229,6 +2244,7 @@ CONFIG_SENSORS_LM93=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@ -2259,6 +2275,7 @@ CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83793=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_WM831X=m
@ -2282,6 +2299,7 @@ CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX6642=m
@ -2293,13 +2311,16 @@ CONFIG_SENSORS_EMC6W201=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_MAX1668=m

 # CONFIG_HMC6352 is not set
 # CONFIG_BMP085 is not set
 # CONFIG_PCH_PHUB is not set
 # CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set

 CONFIG_W1=m
 CONFIG_W1_CON=y
@ -2339,6 +2360,7 @@ CONFIG_IPMI_POWEROFF=m
 # Watchdog Cards
 #
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_WDTPCI=m
@ -2373,6 +2395,7 @@ CONFIG_USBPCWATCHDOG=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_WM831X_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set

 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@ -2524,6 +2547,7 @@ CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
@ -2585,6 +2609,7 @@ CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
@ -2597,6 +2622,7 @@ CONFIG_MEDIA_TUNER_TDA18212=m
 #
 CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y

@ -2605,6 +2631,8 @@ CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
@ -2690,6 +2718,7 @@ CONFIG_DVB_LGS8GL5=m
 CONFIG_DVB_DUMMY_FE=m
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_MB86A20S=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_DIB9000=m
@ -2767,6 +2796,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
@ -2986,6 +3016,7 @@ CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_CA0110=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
@ -2998,10 +3029,12 @@ CONFIG_SND_HDA_CODEC_INTELHDMI=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
@ -3193,6 +3226,10 @@ CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_ROCCAT_ARVO=m
 CONFIG_HID_ROCCAT_KOVAPLUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_WIIMOTE=m

 #
 # USB Imaging devices
@ -3254,6 +3291,7 @@ CONFIG_USB_GSPCA_SQ930X=m
 CONFIG_USB_GSPCA_NW80X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_SE401=m

 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
@ -3277,6 +3315,7 @@ CONFIG_SOC_CAMERA_MT9T112=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_OV2640=m
 CONFIG_SOC_CAMERA_OV9740=m
@ -3510,7 +3549,7 @@ CONFIG_MFD_WM8400=m
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_WM831X_I2C is not set
-CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CS5535 is not set

 #
 # File systems
@ -3631,6 +3670,7 @@ CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZLIB=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_VXFS_FS=m
 # CONFIG_HPFS_FS is not set
@ -3664,6 +3704,7 @@ CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 # CONFIG_NFSD_DEPRECATED is not set
 CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_PNFS_BLOCK=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
@ -3921,6 +3962,8 @@ CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=m
+CONFIG_CRC8=m
+CONFIG_CORDIC=m

 CONFIG_CRYPTO_ZLIB=m
 CONFIG_ZLIB_INFLATE=y
@ -4177,6 +4220,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_AMS_DELTA is not set
 # CONFIG_LEDS_LOCOMO is not set
 # CONFIG_LEDS_NET48XX is not set
+# CONFIG_LEDS_NET5501 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_BD2802 is not set
@ -4229,6 +4273,7 @@ CONFIG_FUNCTION_TRACER=y
 CONFIG_STACK_TRACER=y

 CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
 CONFIG_OPTPROBES=y

 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
@ -4320,7 +4365,6 @@ CONFIG_RESOURCE_COUNTERS=y

 #FIXME: x86 generic?
 CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_I8K=m
 CONFIG_INPUT_APANEL=m

 # CONFIG_INTEL_MENLOW is not set
@ -4638,8 +4682,10 @@ CONFIG_EVENT_POWER_TRACING_DEPRECATED=y

 CONFIG_NFC_DEVICES=y
 CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m

 CONFIG_TARGET_CORE=m
+CONFIG_ISCSI_TARGET=m
 CONFIG_LOOPBACK_TARGET=m
 # CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_IBLOCK=m
@ -4663,3 +4709,6 @@ CONFIG_TEST_KSTRTOX=m

 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_INTEL_MID_PTI=m
+
+CONFIG_IOMMU_SUPPORT=y
+
--- a/1
+++ b/1
@ -191,6 +191,7 @@ CONFIG_HP_ILO=m

 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y

 CONFIG_DMAR_DEFAULT_ON=y

--- a/2
+++ b/2
@ -2,6 +2,8 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y

+CONFIG_DEBUG_ATOMIC_SLEEP=y
+
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_LOCK_ALLOC=y
--- a/7
+++ b/7
@ -314,16 +314,19 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_MFD_88PM8607 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_XPS_USB_HCD_XILINX is not set
 # CONFIG_MMC_SDHCI_OF_ESDHC is not set
 # CONFIG_MMC_SDHCI_OF_HLWD is not set

 # CONFIG_MFD_TC35892 is not set
+# CONFIG_MFD_AAT2870_CORE is not set

 # CONFIG_GPIO_SCH is not set

 # CONFIG_PPC_MPC512x is not set
+# CONFIG_RTC_DRV_MPC5121 is not set

 CONFIG_MPC512X_DMA=m

@ -342,3 +345,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_MCP23S08 is not set
+
--- a/6
+++ b/6
@ -44,6 +44,7 @@ CONFIG_LPARCFG=y
 CONFIG_SERIAL_ICOM=m
 CONFIG_HVCS=m
 CONFIG_HVC_CONSOLE=y
+# CONFIG_HVC_OLD_HVSI is not set
 CONFIG_HOTPLUG_PCI=y
 CONFIG_THERM_PM72=y
 CONFIG_IBMVETH=m
@ -174,6 +175,8 @@ CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y

 CONFIG_KVM_BOOK3S_64=m
+#-- Enable _HV once publicly available POWER7 hardware can use it
+# CONFIG_KVM_BOOK3S_64_HV is not set
 # CONFIG_KVM_EXIT_TIMING is not set

 #-- bz#607175
@ -188,3 +191,6 @@ CONFIG_PSERIES_ENERGY=m
 CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
+
+CONFIG_BPF_JIT=y
+CONFIG_CPU_FREQ_MAPLE=y
--- a/1
+++ b/1
@ -236,5 +236,4 @@ CONFIG_STRICT_DEVMEM=y

 # CONFIG_WARN_DYNAMIC_STACK is not set

-CONFIG_JUMP_LABEL=y
 CONFIG_CRYPTO_GHASH_S390=m
--- a/2
+++ b/2
@ -191,8 +191,6 @@ CONFIG_FB_XVR1000=y

 CONFIG_CRYPTO_DEV_NIAGARA2=y

-CONFIG_JUMP_LABEL=y
-
 # CONFIG_MTD_OF_PARTS is not set
 # CONFIG_MTD_PHYSMAP_OF is not set
 # CONFIG_MMC_SDHCI_OF is not set
--- a/206
+++ b/206
@ -0,0 +1,206 @@
+# CONFIG_64BIT is not set
+
+CONFIG_X86_32_NON_STANDARD=y
+
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+CONFIG_X86_BIGSMP=y
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+
+CONFIG_NR_CPUS=64
+CONFIG_X86_GENERIC=y
+# CONFIG_X86_PPRO_FENCE is not set
+
+CONFIG_TOSHIBA=m
+
+CONFIG_SONYPI=m
+CONFIG_SONYPI_COMPAT=y
+
+# CONFIG_NUMA is not set
+
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
+
+# CONFIG_MATH_EMULATION is not set
+
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE_GX=y
+# CONFIG_FB_GEODE_GX1 is not set
+
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+CONFIG_PCI_GOANY=y
+
+# FIXME: wtf? "x86 specific drivers"
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_IBM_ASM=m
+
+#
+# APM (Advanced Power Management) BIOS Support
+#
+CONFIG_APM=y
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+# CONFIG_APM_DO_ENABLE is not set
+CONFIG_APM_CPU_IDLE=y
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_ALLOW_INTS is not set
+
+CONFIG_ACPI_BLACKLIST_YEAR=1999
+
+
+# CONFIG_X86_POWERNOW_K6 is not set
+CONFIG_X86_POWERNOW_K7=y
+# CONFIG_X86_GX_SUSPMOD is not set
+CONFIG_X86_SPEEDSTEP_ICH=y
+CONFIG_X86_SPEEDSTEP_SMI=y
+CONFIG_X86_SPEEDSTEP_LIB=y
+# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
+CONFIG_X86_LONGRUN=y
+# CONFIG_X86_LONGHAUL is not set
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# e_powersaver is dangerous
+# CONFIG_X86_E_POWERSAVER is not set
+
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+
+
+# CONFIG_4KSTACKS is not set
+
+CONFIG_PCI_DIRECT=y
+
+# SHPC has half-arsed PCI probing, which makes it load on too many systems
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+CONFIG_BLK_DEV_AMD74XX=y
+
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+
+CONFIG_SCx200_ACB=m
+
+# CONFIG_X86_REBOOTFIXUPS is not set
+
+CONFIG_PC8736x_GPIO=m
+# CONFIG_NSC_GPIO is not set
+CONFIG_CS5535_GPIO=m
+CONFIG_GPIO_SCH=m
+
+CONFIG_SND_ISA=y
+CONFIG_SND_ES18XX=m
+
+CONFIG_HW_RANDOM_GEODE=m
+
+# CONFIG_SGI_IOC4 is not set
+
+CONFIG_TC1100_WMI=m
+
+CONFIG_IB700_WDT=m
+
+CONFIG_PHYSICAL_ALIGN=0x400000
+CONFIG_PHYSICAL_START=0x400000
+
+# CONFIG_KEXEC_JUMP is not set
+
+CONFIG_CRYPTO_AES_586=y
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
+CONFIG_VIDEO_CAFE_CCIC=m
+
+CONFIG_VMI=y
+
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+
+CONFIG_MTD_NAND_CAFE=m
+
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+
+
+CONFIG_OLPC=y
+CONFIG_OLPC_OPENFIRMWARE=y
+CONFIG_BATTERY_OLPC=y
+CONFIG_MOUSE_PS2_OLPC=y
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO15_SCI=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+# staging
+# CONFIG_FB_OLPC_DCON is not set
+
+# CONFIG_SPARSE_IRQ is not set
+
+CONFIG_RCU_FANOUT=32
+
+# CONFIG_X86_ANCIENT_MCE is not set
+
+# CONFIG_X86_MRST is not set
+
+CONFIG_I2C_PXA=m
+# CONFIG_GPIO_LANGWELL is not set
+
+# CONFIG_INTEL_TXT is not set
+
+CONFIG_GEODE_WDT=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+
+CONFIG_LEDS_INTEL_SS4200=m
+
+CONFIG_OLPC_XO1=m
+CONFIG_XO1_RFKILL=m
+
+CONFIG_X86_32_IRIS=m
+
+
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_PHYSMAP_OF=m
+CONFIG_PROC_DEVICETREE=y
+CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
+# CONFIG_MMC_SDHCI_OF is not set
+
+# CONFIG_X86_INTEL_MID is not set
+
+CONFIG_MFD_CS5535=m
+
+# I2O enabled only for 32-bit x86, disabled for PAE kernel
+CONFIG_I2O=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_I2O_CONFIG=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+
--- a/277
+++ b/277
@ -1,68 +1,30 @@
 CONFIG_UID16=y
-# CONFIG_64BIT is not set
-# CONFIG_KERNEL_LZMA is not set

-#
-# Processor type and features
-#
-#
-# Enable summit and co via the generic arch
-#
 CONFIG_X86_EXTENDED_PLATFORM=y
-CONFIG_X86_32_NON_STANDARD=y

-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-CONFIG_X86_BIGSMP=y
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
 CONFIG_SMP=y
-CONFIG_NR_CPUS=64
+
 CONFIG_X86_GENERIC=y
-# CONFIG_X86_PPRO_FENCE is not set
+
 CONFIG_HPET=y
 CONFIG_HPET_TIMER=y
 # CONFIG_HPET_MMAP is not set
-CONFIG_X86_MCE=y
-CONFIG_TOSHIBA=m
+
 CONFIG_I8K=m
-CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
-# CONFIG_NUMA is not set

-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
-
-# CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y

@ -70,60 +32,30 @@ CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
+
+# FIXME: 32bit only?
 # CONFIG_FB_N411 is not set

 CONFIG_DMAR=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_DMAR_DEFAULT_ON=y
-
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=y
-CONFIG_FB_GEODE_GX=y
-# CONFIG_FB_GEODE_GX1 is not set
-
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-CONFIG_PCI_GOANY=y
-
-#
-# x86 specific drivers
-#
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m

-CONFIG_CC_STACKPROTECTOR=y
-
 CONFIG_SECCOMP=y

 CONFIG_CAPI_EICON=y

-# I2O enabled only for 32-bit x86, disabled for PAE kernel
-CONFIG_I2O=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_I2O_CONFIG=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-
 #
 # Kernel debugging
 #
 CONFIG_X86_MPPARSE=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_NMI_TIMEOUT=5

 CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
@ -131,7 +63,6 @@ CONFIG_ACPI_AC=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_BATTERY=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_DOCK=y
@ -143,7 +74,6 @@ CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 # CONFIG_ACPI_PROC_EVENT is not set
@ -153,54 +83,32 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 # CONFIG_ACPI_APEI_EINJ is not set
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_CUSTOM_METHOD=m

 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_PCC_CPUFREQ=y
-# CONFIG_X86_POWERNOW_K6 is not set
-CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K8=y
-# CONFIG_X86_GX_SUSPMOD is not set
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=y
-CONFIG_X86_SPEEDSTEP_LIB=y
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_X86_P4_CLOCKMOD=y
-CONFIG_X86_LONGRUN=y
-# CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# e_powersaver is dangerous
-# CONFIG_X86_E_POWERSAVER is not set
-
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set

 #
 # various x86 specific drivers
 #
 CONFIG_NVRAM=y
-CONFIG_IBM_ASM=m
-CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m

 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_SCHED_SMT=y
+
 CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""

-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_4KSTACKS is not set
-CONFIG_DEBUG_NMI_TIMEOUT=5
-
-CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y

@ -209,8 +117,7 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
-# SHPC has half-arsed PCI probing, which makes it load on too many systems
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+
 CONFIG_PM=y

 CONFIG_IPW2100=m
@ -223,9 +130,6 @@ CONFIG_IPW2200_QOS=y

 CONFIG_BLK_DEV_AMD74XX=y

-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_ALI1563=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
@ -234,45 +138,35 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
 CONFIG_I2C_PIIX4=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m
-
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m

-CONFIG_SCx200_ACB=m
-
-# CONFIG_X86_REBOOTFIXUPS is not set
-
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m

-CONFIG_GPIO_SCH=m
-CONFIG_PC8736x_GPIO=m
-# CONFIG_NSC_GPIO is not set
-CONFIG_CS5535_GPIO=m
-
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_AMD8111=m
+CONFIG_EDAC_AMD8131=m
 CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
 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_EDAC_I7CORE=m
-CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I7300=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_R82600=m
 CONFIG_EDAC_X38=m
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_EDAC_DECODE_MCE=m

 CONFIG_SCHED_MC=y

@ -283,77 +177,70 @@ CONFIG_TCG_INFINEON=m

 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_VIA=m

-
 # CONFIG_COMPAT_VDSO is not set

-# CONFIG_SGI_IOC4 is not set
-
 CONFIG_X86_PLATFORM_DEVICES=y
+
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
 CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
+CONFIG_TOPSTAR_LAPTOP=m
+
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
-CONFIG_TC1100_WMI=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
 CONFIG_HP_WMI=m
 # CONFIG_INTEL_SCU_IPC is not set
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_XO15_EBOOK=m
+CONFIG_EEEPC_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_XO15_EBOOK=m

 # CONFIG_TOUCHSCREEN_INTEL_MID is not set

 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
-CONFIG_IB700_WDT=m

-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x400000
-CONFIG_PHYSICAL_START=0x400000
 CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PROC_VMCORE=y
 CONFIG_CRASH=m

-CONFIG_CRYPTO_DEV_GEODE=m
-
-CONFIG_VIDEO_CAFE_CCIC=m
-
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_LGUEST=m
+CONFIG_LGUEST_GUEST=y

 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_PARAVIRT_DEBUG is not set

 # PARAVIRT_SPINLOCKS has a 5% perf hit
+# FIXME: Still true ? References?
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_KVM_MMU_AUDIT=y # default $x would be nice...
-CONFIG_LGUEST_GUEST=y
-CONFIG_VMI=y

 CONFIG_XEN=y
 # CONFIG_XEN_DEBUG is not set
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_SAVE_RESTORE=y
@ -374,10 +261,11 @@ CONFIG_XEN_DEBUG_FS=y
 CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_XEN_GNTDEV=m
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_XEN_SELFBALLOONING=y
+CONFIG_XEN_PCIDEV_BACKEND=m

 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_NAND_CAFE=m

 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@ -407,53 +295,34 @@ CONFIG_INTEL_IOATDMA=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_PKGTEMP=m

 # CONFIG_CPA_DEBUG is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set

 CONFIG_HP_WATCHDOG=m
 CONFIG_NV_TCO=m
 CONFIG_SP5100_TCO=m

-CONFIG_OLPC=y
-CONFIG_OLPC_OPENFIRMWARE=y
-CONFIG_BATTERY_OLPC=y
-CONFIG_MOUSE_PS2_OLPC=y
-
-# staging
-# CONFIG_FB_OLPC_DCON is not set
-
 CONFIG_STRICT_DEVMEM=y

 # CONFIG_NO_BOOTMEM is not set

 # CONFIG_MEMTEST is not set
 # CONFIG_MAXSMP is not set
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+
 CONFIG_SYSPROF_TRACER=y

-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_MMIOTRACE_TEST is not set
-
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-
 CONFIG_HP_ILO=m

 CONFIG_BACKLIGHT_APPLE=m

 CONFIG_OPROFILE_IBS=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y

 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW_64K=y

 # CONFIG_CMDLINE_BOOL is not set

-CONFIG_PANASONIC_LAPTOP=m
-
 CONFIG_X86_PTRACE_BTS=y

 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@ -461,47 +330,28 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_POWER_TRACER=y
 CONFIG_HW_BRANCH_TRACER=y

-# CONFIG_SPARSE_IRQ is not set
-
-CONFIG_RCU_FANOUT=32
-
 # CONFIG_IOMMU_STRESS is not set

 CONFIG_PERF_COUNTERS=y
 CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y

+CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
 # CONFIG_X86_MCE_INJECT is not set

-# CONFIG_X86_MRST is not set
 CONFIG_SFI=y

 CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_I2C_SCMI=m
-CONFIG_I2C_PXA=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_DECODE_MCE=m
-
-# CONFIG_GPIO_LANGWELL is not set
-
-# CONFIG_INTEL_TXT is not set
-
-CONFIG_CS5535_MFGPT=m
-CONFIG_GEODE_WDT=m
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-
-CONFIG_LEDS_INTEL_SS4200=m

 CONFIG_X86_DECODER_SELFTEST=y

 CONFIG_ACPI_CMPC=m
 CONFIG_MSI_WMI=m
 CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_SAMSUNG_LAPTOP=m

 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
@ -510,46 +360,39 @@ CONFIG_PCI_CNB20LE_QUIRK=y

 CONFIG_ACPI_EC_DEBUGFS=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
+# CONFIG_ACPI_QUICKSTART is not set
+CONFIG_IDEAPAD_ACPI=m
+
 CONFIG_INTEL_IDLE=y
+
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-CONFIG_SENSORS_PKGTEMP=m
 CONFIG_F71808E_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_INTEL_MID_DMAC is not set
 CONFIG_PCH_DMA=m
-# CONFIG_ACPI_QUICKSTART is not set
-CONFIG_IDEAPAD_ACPI=m
 CONFIG_INTEL_IPS=m
 # CONFIG_IBM_RTL is not set

-CONFIG_OLPC_XO1=m
-CONFIG_XO1_RFKILL=m
 CONFIG_VIDEO_VIA_CAMERA=m

-CONFIG_EDAC_MCE_INJ=m
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_X86_RESERVE_LOW=64

 CONFIG_PCH_GBE=m
 CONFIG_PCH_PHUB=m

-CONFIG_JUMP_LABEL=y
-
-CONFIG_X86_32_IRIS=m
-
 CONFIG_TRANSPARENT_HUGEPAGE=y

 CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_AES_586=y
-
-CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_PROC_DEVICETREE=y
-CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
-# CONFIG_MMC_SDHCI_OF is not set

 CONFIG_HP_ACCEL=m

 # CONFIG_RAPIDIO is not set
+
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_MCP23S08 is not set
+
+CONFIG_SCHED_SMT=y
+CONFIG_CC_STACKPROTECTOR=y
+CONFIG_RELOCATABLE=y
--- a/377
+++ b/377
@ -1,229 +1,59 @@
 CONFIG_64BIT=y
-CONFIG_UID16=y
-# CONFIG_KERNEL_LZMA is not set

 # 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_MTRR=y
 CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
+
 CONFIG_NR_CPUS=512
-CONFIG_X86_POWERNOW_K8=y
-CONFIG_X86_P4_CLOCKMOD=y
+CONFIG_PHYSICAL_START=0x1000000
+
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
+
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_STATS=y
 # CONFIG_IOMMU_DEBUG is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_MICROCODE=m
 CONFIG_SWIOTLB=y
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_DMAR=y
-CONFIG_DMAR_BROKEN_GFX_WA=y
-CONFIG_DMAR_FLOPPY_WA=y
-CONFIG_DMAR_DEFAULT_ON=y

 CONFIG_KEXEC_JUMP=y

-CONFIG_EFI=y
-CONFIG_EFI_VARS=y
-CONFIG_EFI_PCDP=y
-CONFIG_FB_EFI=y
-
-CONFIG_SCSI_ADVANSYS=m
-
-CONFIG_SECCOMP=y
-
-CONFIG_CAPI_EICON=y
-
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_SCHED_SMT=y
-CONFIG_SUSPEND=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_PCC_CPUFREQ=y
-CONFIG_X86_ACPI_CPUFREQ=y
-
-CONFIG_ACPI=y
-CONFIG_ACPI_AC=y
-# CONFIG_ACPI_ASUS is not set
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
-CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_FAN=y
 CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_VIDEO=m
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_HED=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_GHES=m
-# CONFIG_ACPI_APEI_EINJ is not set
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_CUSTOM_METHOD=m
-
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ASUS_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_MSI_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_HP_WMI=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-# CONFIG_XO15_EBOOK is not set
-CONFIG_INTEL_OAKTRAIL=m

 # CONFIG_INTEL_SCU_IPC is not set

-# CONFIG_TOUCHSCREEN_INTEL_MID is not set
-
-CONFIG_THINKPAD_ACPI=m
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 CONFIG_HOTPLUG_PCI_SHPC=m

-CONFIG_HPET=y
-# CONFIG_HPET_MMAP is not set
-CONFIG_PM=y
-
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-
 CONFIG_PNP=y
-CONFIG_PNPACPI=y

+# Really ? not 32bit only ?
 CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m

 CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
-
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m

 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_PIIX4=m
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set

-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-
-CONFIG_NVRAM=y
-
-CONFIG_EDAC=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_E7XXX=m
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I5400=m
-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_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I7300=m
-CONFIG_EDAC_X38=m

-CONFIG_SCHED_MC=y
-
-CONFIG_TCG_INFINEON=m
-
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-
-# CONFIG_HW_RANDOM_GEODE is not set
-
-
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_NMI_TIMEOUT=5
-
-CONFIG_GPIO_SCH=m
 # CONFIG_PC8736x_GPIO is not set

 # CONFIG_DISCONTIGMEM_MANUAL is not set
@ -242,223 +72,46 @@ CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_CS5535 is not set

-CONFIG_CC_STACKPROTECTOR=y
-
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_XP=m
 CONFIG_SGI_GRU=m
 # CONFIG_SGI_GRU_DEBUG is not set

-# CONFIG_SMSC37B787_WDT is not set
-CONFIG_W83697HF_WDT=m
-
 # CONFIG_VIDEO_CAFE_CCIC is not set

-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-
-CONFIG_RELOCATABLE=y
-CONFIG_MACINTOSH_DRIVERS=y
-
-CONFIG_CRASH_DUMP=y
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_PROC_VMCORE=y
-CONFIG_CRASH=m
-
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-
-
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=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_KVM_MMU_AUDIT=y
-
-CONFIG_XEN=y
-# CONFIG_XEN_DEBUG is not set
 CONFIG_XEN_MAX_DOMAIN_MEMORY=32
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_SAVE_RESTORE=y
-CONFIG_HVC_XEN=y
-CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_XEN_KBDDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_XEN_WDT=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_DEBUG_FS=y
-CONFIG_XEN_PLATFORM_PCI=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m

-CONFIG_DMADEVICES=y
-CONFIG_INTEL_IOATDMA=m
-
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_ACPI_POWER=m
-
-# CONFIG_COMPAT_VDSO is not set
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_CPA_DEBUG is not set
-
-CONFIG_HP_WATCHDOG=m
-CONFIG_NV_TCO=m
-CONFIG_SP5100_TCO=m

 CONFIG_FRAME_WARN=2048

 CONFIG_NODES_SHIFT=9
-CONFIG_X86_PAT=y
-# FIXME: These should be 32bit only
-# CONFIG_FB_N411 is not set
-CONFIG_STRICT_DEVMEM=y

 CONFIG_DIRECT_GBPAGES=y

-# CONFIG_NO_BOOTMEM is not set
-
-# CONFIG_MEMTEST is not set
-CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_STATS=y
-# CONFIG_MAXSMP is not set
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_SYSPROF_TRACER=y
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_MMIOTRACE_TEST is not set
-
 CONFIG_X86_MPPARSE=y

-CONFIG_BACKLIGHT_APPLE=m
-
-CONFIG_OPROFILE_IBS=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
-
-# CONFIG_CMDLINE_BOOL is not set
-
-CONFIG_PANASONIC_LAPTOP=m
-
-CONFIG_X86_PTRACE_BTS=y
-
 CONFIG_I7300_IDLE=m
 CONFIG_INTR_REMAP=y

-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-
-CONFIG_POWER_TRACER=y
-CONFIG_HW_BRANCH_TRACER=y
-
 CONFIG_X86_X2APIC=y
 CONFIG_SPARSE_IRQ=y

 CONFIG_RCU_FANOUT=64

-# CONFIG_IOMMU_STRESS is not set
-
-CONFIG_PERF_COUNTERS=y
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-
-# CONFIG_X86_MCE_INJECT is not set
-
-CONFIG_SFI=y
-CONFIG_INPUT_WINBOND_CIR=m
-CONFIG_I2C_SCMI=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EDAC_I3200=m
-CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_INTEL_TXT=y
+
 CONFIG_GPIO_LANGWELL=y

 CONFIG_FUNCTION_GRAPH_TRACER=y

-CONFIG_ACPI_CMPC=m
-CONFIG_MSI_WMI=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_SAMSUNG_LAPTOP=m
-
-CONFIG_CS5535_MFGPT=m
-CONFIG_GEODE_WDT=m
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-
-CONFIG_X86_DECODER_SELFTEST=y
-
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_LPC_SCH=m
-
 CONFIG_I7300_IDLE=m

-CONFIG_PCI_CNB20LE_QUIRK=y
-
-CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_APEI_ERST_DEBUG is not set
-CONFIG_INTEL_IDLE=y
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-CONFIG_SENSORS_PKGTEMP=m
-CONFIG_F71808E_WDT=m
-CONFIG_HPWDT_NMI_DECODING=y
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_INTEL_MID_DMAC is not set
-CONFIG_PCH_DMA=m
-# CONFIG_ACPI_QUICKSTART is not set
-CONFIG_IDEAPAD_ACPI=m
-CONFIG_INTEL_IPS=m
-CONFIG_IDEAPAD_LAPTOP=m
-# CONFIG_IBM_RTL is not set
-
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_X86_RESERVE_LOW=64
-
-CONFIG_PCH_GBE=m
-CONFIG_PCH_PHUB=m
-
-CONFIG_VIDEO_VIA_CAMERA=m
-
-CONFIG_JUMP_LABEL=y
-
-CONFIG_HP_ILO=m
-
-CONFIG_TRANSPARENT_HUGEPAGE=y
-
-CONFIG_HP_ACCEL=m
-
-# CONFIG_RAPIDIO is not set
-
 CONFIG_BPF_JIT=y
+
+# Should be 32bit only, but lacks KConfig depends
+# CONFIG_XO15_EBOOK is not set
+
--- a/dmar-disable-when-ricoh-multifunction.patch
+++ b/dmar-disable-when-ricoh-multifunction.patch
@ -9,8 +9,8 @@ Subject: [PATCH] dmar: disable if ricoh multifunction detected

 diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
 index 4789f8e..5923914 100644
--- a/drivers/pci/intel-iommu.c
-+++ b/drivers/pci/intel-iommu.c
+--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3784,6 +3784,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0044, quirk_calpella_no_shadow_g
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0062, quirk_calpella_no_shadow_gtt);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x006a, quirk_calpella_no_shadow_gtt);
--- a/epoll-fix-spurious-lockdep-warnings.patch
+++ b/epoll-fix-spurious-lockdep-warnings.patch
@ -113,4 +113,4 @@ index f9cfd16..0cb7bc6 100644
 --
 To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
 the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
--- a/fix-cdc-ncm-dma-stack-vars.patch
+++ b/fix-cdc-ncm-dma-stack-vars.patch
@ -1,4 +1,4 @@
-commit d072ef23b8ee6bcabc00beff0b5702e704a473cb
+commit 05511b61169da2f8dab464df61fa2bb952763a23
 Author: Josh Boyer <jwboyer@redhat.com>
 Date:   Tue Aug 2 08:09:56 2011 -0400

@ -13,11 +13,11 @@ Date:   Tue Aug 2 08:09:56 2011 -0400
    Signed-off-by: Josh Boyer <jwboyer@redhat.com>

 diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
-index fd622a6..96dd386 100644
+index a03336e..f06fb78 100644
 --- a/drivers/net/usb/cdc_ncm.c
 +++ b/drivers/net/usb/cdc_ncm.c
-@@ -260,23 +260,38 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
- 		req.wIndex = cpu_to_le16(iface_no);
+@@ -228,23 +228,40 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
+ 	if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {
 
 		if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) {
 -			struct usb_cdc_ncm_ndp_input_size ndp_in_sz;
@ -28,87 +28,82 @@ index fd622a6..96dd386 100644
 +				err = -ENOMEM;
 +				goto size_err;
 +			}
- 
- 			req.wLength = 8;
-			ndp_in_sz.dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
-			ndp_in_sz.wNtbInMaxDatagrams =
-+			ndp_in_sz->dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
-+			ndp_in_sz->wNtbInMaxDatagrams =
- 					cpu_to_le16(CDC_NCM_DPT_DATAGRAMS_MAX);
-			ndp_in_sz.wReserved = 0;
-			err = cdc_ncm_do_request(ctx, &req, &ndp_in_sz, 0, NULL,
-+			ndp_in_sz->wReserved = 0;
-+			err = cdc_ncm_do_request(ctx, &req, ndp_in_sz, 0, NULL,
- 									1000);
+
+ 			err = usb_control_msg(ctx->udev,
+ 					usb_sndctrlpipe(ctx->udev, 0),
+ 					USB_CDC_SET_NTB_INPUT_SIZE,
+ 					USB_TYPE_CLASS | USB_DIR_OUT
+ 					 | USB_RECIP_INTERFACE,
+-					0, iface_no, &ndp_in_sz, 8, 1000);
+					0, iface_no, ndp_in_sz, 8, 1000);
 +			kfree(ndp_in_sz);
 		} else {
 -			__le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
 +			__le32 *dwNtbInMaxSize;
-+			dwNtbInMaxSize = kzalloc(sizeof(*dwNtbInMaxSize), GFP_KERNEL);
+			dwNtbInMaxSize = kzalloc(sizeof(*dwNtbInMaxSize),
+					GFP_KERNEL);
 +			if (!dwNtbInMaxSize) {
 +				err = -ENOMEM;
 +				goto size_err;
 +			}
 +			*dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
- 
- 			req.wLength = 4;
-			err = cdc_ncm_do_request(ctx, &req, &dwNtbInMaxSize, 0,
-+			err = cdc_ncm_do_request(ctx, &req, dwNtbInMaxSize, 0,
- 								NULL, 1000);
+
+ 			err = usb_control_msg(ctx->udev,
+ 					usb_sndctrlpipe(ctx->udev, 0),
+ 					USB_CDC_SET_NTB_INPUT_SIZE,
+ 					USB_TYPE_CLASS | USB_DIR_OUT
+ 					 | USB_RECIP_INTERFACE,
+-					0, iface_no, &dwNtbInMaxSize, 4, 1000);
+					0, iface_no, dwNtbInMaxSize, 4, 1000);
 +			kfree(dwNtbInMaxSize);
 		}
- 
+-
 +size_err:
- 		if (err)
+ 		if (err < 0)
 			pr_debug("Setting NTB Input Size failed\n");
 	}
-@@ -362,9 +377,15 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
+@@ -325,19 +342,29 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
 
 	/* set Max Datagram Size (MTU) */
 	if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {
 -		__le16 max_datagram_size;
 +		__le16 *max_datagram_size;
 		u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
- 
-+		max_datagram_size = kzalloc(sizeof(*max_datagram_size), GFP_KERNEL);
+
+		max_datagram_size = kzalloc(sizeof(*max_datagram_size),
+				GFP_KERNEL);
 +		if (!max_datagram_size) {
 +			err = -ENOMEM;
 +			goto max_dgram_err;
 +		}
 +
- 		req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN |
- 							USB_RECIP_INTERFACE;
- 		req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE;
-@@ -372,13 +393,15 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
- 		req.wIndex = cpu_to_le16(iface_no);
- 		req.wLength = cpu_to_le16(2);
- 
-		err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL,
-+		err = cdc_ncm_do_request(ctx, &req, max_datagram_size, 0, NULL,
- 									1000);
-+
- 		if (err) {
+ 		err = usb_control_msg(ctx->udev, usb_rcvctrlpipe(ctx->udev, 0),
+ 				USB_CDC_GET_MAX_DATAGRAM_SIZE,
+ 				USB_TYPE_CLASS | USB_DIR_IN
+ 				 | USB_RECIP_INTERFACE,
+-				0, iface_no, &max_datagram_size,
+				0, iface_no, max_datagram_size,
+ 				2, 1000);
+ 		if (err < 0) {
 			pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",
 						CDC_NCM_MIN_DATAGRAM_SIZE);
 +			kfree(max_datagram_size);
 		} else {
 -			ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
-+			ctx->max_datagram_size = le16_to_cpu(*max_datagram_size);
+			ctx->max_datagram_size =
+				le16_to_cpu(*max_datagram_size);
 			/* Check Eth descriptor value */
 			if (eth_max_sz < CDC_NCM_MAX_DATAGRAM_SIZE) {
 				if (ctx->max_datagram_size > eth_max_sz)
-@@ -401,10 +424,12 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
- 			req.wValue = 0;
- 			req.wIndex = cpu_to_le16(iface_no);
- 			req.wLength = 2;
-			max_datagram_size = cpu_to_le16(ctx->max_datagram_size);
-+			*max_datagram_size = cpu_to_le16(ctx->max_datagram_size);
- 
-			err = cdc_ncm_do_request(ctx, &req, &max_datagram_size,
-+			err = cdc_ncm_do_request(ctx, &req, max_datagram_size,
- 								0, NULL, 1000);
+@@ -360,8 +387,10 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
+ 						USB_TYPE_CLASS | USB_DIR_OUT
+ 						 | USB_RECIP_INTERFACE,
+ 						0,
+-						iface_no, &max_datagram_size,
+						iface_no, max_datagram_size,
+ 						2, 1000);
 +			kfree(max_datagram_size);
 +max_dgram_err:
- 			if (err)
+ 			if (err < 0)
 				pr_debug("SET_MAX_DATAGRAM_SIZE failed\n");
 		}
--- a/hda_intel-prealloc-4mb-dmabuffer.patch
+++ b/hda_intel-prealloc-4mb-dmabuffer.patch
@ -1,47 +0,0 @@
-From c69fcbd1f60b0842f7c1ad2c95692ffd19c4932b Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle@phobos.i.jkkm.org>
-Date: Mon, 29 Mar 2010 23:56:08 -0400
-Subject: hda_intel-prealloc-4mb-dmabuffer
-
---
- sound/pci/hda/hda_intel.c |   14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index 4bb9067..37db515 100644
--- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -1986,6 +1986,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
- 	struct azx_pcm *apcm;
- 	int pcm_dev = cpcm->device;
- 	int s, err;
-+	size_t prealloc_min = 64*1024;	/* 64KB */
- 
- 	if (pcm_dev >= HDA_MAX_PCMS) {
- 		snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n",
-@@ -2019,10 +2020,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
- 		if (cpcm->stream[s].substreams)
- 			snd_pcm_set_ops(pcm, s, &azx_pcm_ops);
- 	}
-+
- 	/* buffer pre-allocation */
-+
-+	/* subtle, don't allocate a big buffer for modems...
-+	 * also, don't just test 32BIT_MASK, since azx supports
-+	 * 64-bit DMA in some cases.
-+	 */
-+	/* lennart wants a 2.2MB buffer for 2sec of 48khz */
-+	if (pcm->dev_class == SNDRV_PCM_CLASS_GENERIC &&
-+	    chip->pci->dma_mask >= DMA_32BIT_MASK)
-+		prealloc_min = 4 * 1024 * 1024;	/* 4MB */
-+
- 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
- 					      snd_dma_pci_data(chip->pci),
-					      1024 * 64, 32 * 1024 * 1024);
-+					      prealloc_min, 32 * 1024 * 1024);
- 	return 0;
- }
- 
-- 
-1.7.0.1
-
--- a/hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch
+++ b/hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch
@ -1,315 +0,0 @@
-From 6596528e391ad978a6a120142cba97a1d7324cb6 Mon Sep 17 00:00:00 2001
-From: Seth Forshee <seth.forshee@canonical.com>
-Date: Mon, 18 Jul 2011 08:06:23 -0700
-Subject: [PATCH] hfsplus: ensure bio requests are not smaller than the
- hardware sectors
-
-Currently all bio requests are 512 bytes, which may fail for media
-whose physical sector size is larger than this. Ensure these
-requests are not smaller than the block device logical block size.
-
-BugLink: http://bugs.launchpad.net/bugs/734883
-Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
-Signed-off-by: Christoph Hellwig <hch@lst.de>
---
- fs/hfsplus/hfsplus_fs.h |   16 ++++++++-
- fs/hfsplus/part_tbl.c   |   32 ++++++++++--------
- fs/hfsplus/super.c      |   12 +++---
- fs/hfsplus/wrapper.c    |   83 +++++++++++++++++++++++++++++++++++-----------
- 4 files changed, 101 insertions(+), 42 deletions(-)
-
-diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
-index 0bebf74..81dfd1e 100644
--- a/fs/hfsplus/hfsplus_fs.h
-+++ b/fs/hfsplus/hfsplus_fs.h
-@@ -13,6 +13,7 @@
- #include <linux/fs.h>
- #include <linux/mutex.h>
- #include <linux/buffer_head.h>
-+#include <linux/blkdev.h>
- #include "hfsplus_raw.h"
- 
- #define DBG_BNODE_REFS	0x00000001
-@@ -110,7 +111,9 @@ struct hfsplus_vh;
- struct hfs_btree;
- 
- struct hfsplus_sb_info {
-+	void *s_vhdr_buf;
- 	struct hfsplus_vh *s_vhdr;
-+	void *s_backup_vhdr_buf;
- 	struct hfsplus_vh *s_backup_vhdr;
- 	struct hfs_btree *ext_tree;
- 	struct hfs_btree *cat_tree;
-@@ -258,6 +261,15 @@ struct hfsplus_readdir_data {
- 	struct hfsplus_cat_key key;
- };
- 
-+/*
-+ * Find minimum acceptible I/O size for an hfsplus sb.
-+ */
-+static inline unsigned short hfsplus_min_io_size(struct super_block *sb)
-+{
-+	return max_t(unsigned short, bdev_logical_block_size(sb->s_bdev),
-+		     HFSPLUS_SECTOR_SIZE);
-+}
-+
- #define hfs_btree_open hfsplus_btree_open
- #define hfs_btree_close hfsplus_btree_close
- #define hfs_btree_write hfsplus_btree_write
-@@ -436,8 +448,8 @@ int hfsplus_compare_dentry(const struct dentry *parent,
- /* wrapper.c */
- int hfsplus_read_wrapper(struct super_block *);
- int hfs_part_find(struct super_block *, sector_t *, sector_t *);
-int hfsplus_submit_bio(struct block_device *bdev, sector_t sector,
-		void *data, int rw);
-+int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
-+		void *buf, void **data, int rw);
- 
- /* time macros */
- #define __hfsp_mt2ut(t)		(be32_to_cpu(t) - 2082844800U)
-diff --git a/fs/hfsplus/part_tbl.c b/fs/hfsplus/part_tbl.c
-index 40ad88c..eb355d8 100644
--- a/fs/hfsplus/part_tbl.c
-+++ b/fs/hfsplus/part_tbl.c
-@@ -88,11 +88,12 @@ static int hfs_parse_old_pmap(struct super_block *sb, struct old_pmap *pm,
- 	return -ENOENT;
- }
- 
-static int hfs_parse_new_pmap(struct super_block *sb, struct new_pmap *pm,
-		sector_t *part_start, sector_t *part_size)
-+static int hfs_parse_new_pmap(struct super_block *sb, void *buf,
-+		struct new_pmap *pm, sector_t *part_start, sector_t *part_size)
- {
- 	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
- 	int size = be32_to_cpu(pm->pmMapBlkCnt);
-+	int buf_size = hfsplus_min_io_size(sb);
- 	int res;
- 	int i = 0;
- 
-@@ -107,11 +108,14 @@ static int hfs_parse_new_pmap(struct super_block *sb, struct new_pmap *pm,
- 		if (++i >= size)
- 			return -ENOENT;
- 
-		res = hfsplus_submit_bio(sb->s_bdev,
-					 *part_start + HFS_PMAP_BLK + i,
-					 pm, READ);
-		if (res)
-			return res;
-+		pm = (struct new_pmap *)((u8 *)pm + HFSPLUS_SECTOR_SIZE);
-+		if ((u8 *)pm - (u8 *)buf >= buf_size) {
-+			res = hfsplus_submit_bio(sb,
-+						 *part_start + HFS_PMAP_BLK + i,
-+						 buf, (void **)&pm, READ);
-+			if (res)
-+				return res;
-+		}
- 	} while (pm->pmSig == cpu_to_be16(HFS_NEW_PMAP_MAGIC));
- 
- 	return -ENOENT;
-@@ -124,15 +128,15 @@ static int hfs_parse_new_pmap(struct super_block *sb, struct new_pmap *pm,
- int hfs_part_find(struct super_block *sb,
- 		sector_t *part_start, sector_t *part_size)
- {
-	void *data;
-+	void *buf, *data;
- 	int res;
- 
-	data = kmalloc(HFSPLUS_SECTOR_SIZE, GFP_KERNEL);
-	if (!data)
-+	buf = kmalloc(hfsplus_min_io_size(sb), GFP_KERNEL);
-+	if (!buf)
- 		return -ENOMEM;
- 
-	res = hfsplus_submit_bio(sb->s_bdev, *part_start + HFS_PMAP_BLK,
-				 data, READ);
-+	res = hfsplus_submit_bio(sb, *part_start + HFS_PMAP_BLK,
-+				 buf, &data, READ);
- 	if (res)
- 		goto out;
- 
-@@ -141,13 +145,13 @@ int hfs_part_find(struct super_block *sb,
- 		res = hfs_parse_old_pmap(sb, data, part_start, part_size);
- 		break;
- 	case HFS_NEW_PMAP_MAGIC:
-		res = hfs_parse_new_pmap(sb, data, part_start, part_size);
-+		res = hfs_parse_new_pmap(sb, buf, data, part_start, part_size);
- 		break;
- 	default:
- 		res = -ENOENT;
- 		break;
- 	}
- out:
-	kfree(data);
-+	kfree(buf);
- 	return res;
- }
-diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
-index 84f56e1..c106ca2 100644
--- a/fs/hfsplus/super.c
-+++ b/fs/hfsplus/super.c
-@@ -203,17 +203,17 @@ int hfsplus_sync_fs(struct super_block *sb, int wait)
- 		write_backup = 1;
- 	}
- 
-	error2 = hfsplus_submit_bio(sb->s_bdev,
-+	error2 = hfsplus_submit_bio(sb,
- 				   sbi->part_start + HFSPLUS_VOLHEAD_SECTOR,
-				   sbi->s_vhdr, WRITE_SYNC);
-+				   sbi->s_vhdr_buf, NULL, WRITE_SYNC);
- 	if (!error)
- 		error = error2;
- 	if (!write_backup)
- 		goto out;
- 
-	error2 = hfsplus_submit_bio(sb->s_bdev,
-+	error2 = hfsplus_submit_bio(sb,
- 				  sbi->part_start + sbi->sect_count - 2,
-				  sbi->s_backup_vhdr, WRITE_SYNC);
-+				  sbi->s_backup_vhdr_buf, NULL, WRITE_SYNC);
- 	if (!error)
- 		error2 = error;
- out:
-@@ -257,8 +257,8 @@ static void hfsplus_put_super(struct super_block *sb)
- 	hfs_btree_close(sbi->ext_tree);
- 	iput(sbi->alloc_file);
- 	iput(sbi->hidden_dir);
-	kfree(sbi->s_vhdr);
-	kfree(sbi->s_backup_vhdr);
-+	kfree(sbi->s_vhdr_buf);
-+	kfree(sbi->s_backup_vhdr_buf);
- 	unload_nls(sbi->nls);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
-diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c
-index 2f933e8..10e515a 100644
--- a/fs/hfsplus/wrapper.c
-+++ b/fs/hfsplus/wrapper.c
-@@ -31,25 +31,67 @@ static void hfsplus_end_io_sync(struct bio *bio, int err)
- 	complete(bio->bi_private);
- }
- 
-int hfsplus_submit_bio(struct block_device *bdev, sector_t sector,
-		void *data, int rw)
-+/*
-+ * hfsplus_submit_bio - Perfrom block I/O
-+ * @sb: super block of volume for I/O
-+ * @sector: block to read or write, for blocks of HFSPLUS_SECTOR_SIZE bytes
-+ * @buf: buffer for I/O
-+ * @data: output pointer for location of requested data
-+ * @rw: direction of I/O
-+ *
-+ * The unit of I/O is hfsplus_min_io_size(sb), which may be bigger than
-+ * HFSPLUS_SECTOR_SIZE, and @buf must be sized accordingly. On reads
-+ * @data will return a pointer to the start of the requested sector,
-+ * which may not be the same location as @buf.
-+ *
-+ * If @sector is not aligned to the bdev logical block size it will
-+ * be rounded down. For writes this means that @buf should contain data
-+ * that starts at the rounded-down address. As long as the data was
-+ * read using hfsplus_submit_bio() and the same buffer is used things
-+ * will work correctly.
-+ */
-+int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
-+		void *buf, void **data, int rw)
- {
- 	DECLARE_COMPLETION_ONSTACK(wait);
- 	struct bio *bio;
- 	int ret = 0;
-+	unsigned int io_size;
-+	loff_t start;
-+	int offset;
-+
-+	/*
-+	 * Align sector to hardware sector size and find offset. We
-+	 * assume that io_size is a power of two, which _should_
-+	 * be true.
-+	 */
-+	io_size = hfsplus_min_io_size(sb);
-+	start = (loff_t)sector << HFSPLUS_SECTOR_SHIFT;
-+	offset = start & (io_size - 1);
-+	sector &= ~((io_size >> HFSPLUS_SECTOR_SHIFT) - 1);
- 
- 	bio = bio_alloc(GFP_NOIO, 1);
- 	bio->bi_sector = sector;
-	bio->bi_bdev = bdev;
-+	bio->bi_bdev = sb->s_bdev;
- 	bio->bi_end_io = hfsplus_end_io_sync;
- 	bio->bi_private = &wait;
- 
-	/*
-	 * We always submit one sector at a time, so bio_add_page must not fail.
-	 */
-	if (bio_add_page(bio, virt_to_page(data), HFSPLUS_SECTOR_SIZE,
-			 offset_in_page(data)) != HFSPLUS_SECTOR_SIZE)
-		BUG();
-+	if (!(rw & WRITE) && data)
-+		*data = (u8 *)buf + offset;
-+
-+	while (io_size > 0) {
-+		unsigned int page_offset = offset_in_page(buf);
-+		unsigned int len = min_t(unsigned int, PAGE_SIZE - page_offset,
-+					 io_size);
-+
-+		ret = bio_add_page(bio, virt_to_page(buf), len, page_offset);
-+		if (ret != len) {
-+			ret = -EIO;
-+			goto out;
-+		}
-+		io_size -= len;
-+		buf = (u8 *)buf + len;
-+	}
- 
- 	submit_bio(rw, bio);
- 	wait_for_completion(&wait);
-@@ -57,8 +99,9 @@ int hfsplus_submit_bio(struct block_device *bdev, sector_t sector,
- 	if (!bio_flagged(bio, BIO_UPTODATE))
- 		ret = -EIO;
- 
-+out:
- 	bio_put(bio);
-	return ret;
-+	return ret < 0 ? ret : 0;
- }
- 
- static int hfsplus_read_mdb(void *bufptr, struct hfsplus_wd *wd)
-@@ -143,17 +186,17 @@ int hfsplus_read_wrapper(struct super_block *sb)
- 		goto out;
- 
- 	error = -ENOMEM;
-	sbi->s_vhdr = kmalloc(HFSPLUS_SECTOR_SIZE, GFP_KERNEL);
-	if (!sbi->s_vhdr)
-+	sbi->s_vhdr_buf = kmalloc(hfsplus_min_io_size(sb), GFP_KERNEL);
-+	if (!sbi->s_vhdr_buf)
- 		goto out;
-	sbi->s_backup_vhdr = kmalloc(HFSPLUS_SECTOR_SIZE, GFP_KERNEL);
-	if (!sbi->s_backup_vhdr)
-+	sbi->s_backup_vhdr_buf = kmalloc(hfsplus_min_io_size(sb), GFP_KERNEL);
-+	if (!sbi->s_backup_vhdr_buf)
- 		goto out_free_vhdr;
- 
- reread:
-	error = hfsplus_submit_bio(sb->s_bdev,
-				   part_start + HFSPLUS_VOLHEAD_SECTOR,
-				   sbi->s_vhdr, READ);
-+	error = hfsplus_submit_bio(sb, part_start + HFSPLUS_VOLHEAD_SECTOR,
-+				   sbi->s_vhdr_buf, (void **)&sbi->s_vhdr,
-+				   READ);
- 	if (error)
- 		goto out_free_backup_vhdr;
- 
-@@ -183,9 +226,9 @@ reread:
- 		goto reread;
- 	}
- 
-	error = hfsplus_submit_bio(sb->s_bdev,
-				   part_start + part_size - 2,
-				   sbi->s_backup_vhdr, READ);
-+	error = hfsplus_submit_bio(sb, part_start + part_size - 2,
-+				   sbi->s_backup_vhdr_buf,
-+				   (void **)&sbi->s_backup_vhdr, READ);
- 	if (error)
- 		goto out_free_backup_vhdr;
- 
-- 
-1.7.6
-
--- 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}
@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 6
+%global baserelease 1
 %global fedora_build %{baserelease}

 # base_sublevel is the kernel version we're starting with and patching
@ -63,7 +63,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}

 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 0
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@ -80,10 +80,9 @@ Summary: The Linux kernel
 ## The not-released-kernel case ##
 %else
 # The next upstream release sublevel (base_sublevel+1)
-# % define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
-%define upstream_sublevel 0
+%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 2
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@ -544,6 +543,7 @@ Source24: config-rhel-generic

 Source30: config-x86-generic
 Source31: config-i686-PAE
+Source32: config-x86-32-generic

 Source40: config-x86_64-generic

@ -641,8 +641,6 @@ Patch470: die-floppy-die.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch

-Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
-
 Patch700: linux-2.6-e1000-ich9-montevina.patch

 Patch800: linux-2.6-crash-driver.patch
@ -684,14 +682,14 @@ Patch12010: add-appleir-usb-driver.patch

 Patch12016: disable-i8042-check-on-apple-mac.patch

-Patch12020: linux-2.6-zd1211rw-fix-invalid-signal-values-from-device.patch
-
 Patch12021: udlfb-bind-framebuffer-to-interface.patch

 Patch12022: fix-cdc-ncm-dma-stack-vars.patch
 Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch
-Patch12024: block-stray-block-put-after-teardown.patch
-Patch12025: usb-add-quirk-for-logitech-webcams.patch
+Patch12024: epoll-fix-spurious-lockdep-warnings.patch
+Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
+Patch12026: block-stray-block-put-after-teardown.patch
+Patch12027: usb-add-quirk-for-logitech-webcams.patch

 # Runtime power management
 Patch12203: linux-2.6-usb-pci-autosuspend.patch
@ -700,9 +698,6 @@ Patch12205: runtime_pm_fixups.patch

 Patch12303: dmar-disable-when-ricoh-multifunction.patch

-Patch13001: epoll-fix-spurious-lockdep-warnings.patch
-Patch13002: hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch
-
 Patch13003: efi-dont-map-boot-services-on-32bit.patch

 Patch20000: utrace.patch
@ -1209,11 +1204,9 @@ ApplyPatch linux-2.6-defaults-aspm.patch
 # ACPI

 # ALSA
-ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch

 # Networking

-ApplyPatch linux-2.6-zd1211rw-fix-invalid-signal-values-from-device.patch

 # Misc fixes
 # The input layer spews crap no-one cares about.
@ -1276,6 +1269,8 @@ ApplyPatch add-appleir-usb-driver.patch
 ApplyPatch udlfb-bind-framebuffer-to-interface.patch
 ApplyPatch fix-cdc-ncm-dma-stack-vars.patch
 ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
+ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
+ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
 ApplyPatch block-stray-block-put-after-teardown.patch
 ApplyPatch usb-add-quirk-for-logitech-webcams.patch

@ -1288,9 +1283,6 @@ ApplyPatch usb-add-quirk-for-logitech-webcams.patch
 # rhbz#605888
 ApplyPatch dmar-disable-when-ricoh-multifunction.patch

-ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
-ApplyPatch hfsplus-ensure-bio-requests-are-not-smaller-than-the.patch
-
 ApplyPatch efi-dont-map-boot-services-on-32bit.patch

 # utrace.
@ -1304,6 +1296,7 @@ ApplyPatch utrace.patch

 chmod +x scripts/checkpatch.pl

+# This Prevents scripts/setlocalversion from mucking with our version numbers.
 touch .scmversion

 # only deal with configs if we are going to build for the arch
--- a/linux-2.6-crash-driver.patch
+++ b/linux-2.6-crash-driver.patch
@ -1,17 +1,17 @@
-From df42d15cd28f468ecd4c30465b98a53cce90617c Mon Sep 17 00:00:00 2001
+From f72d640713d01b3b704c6e84ab49b62f19fc9c22 Mon Sep 17 00:00:00 2001
 From: Kyle McMartin <kyle@phobos.i.jkkm.org>
 Date: Tue, 30 Mar 2010 00:16:25 -0400
-Subject: dev-crash-driver.patch
+Subject: [PATCH] dev-crash-driver.patch

 ---
 arch/ia64/include/asm/crash.h |   90 +++++++++++++++++++++++++++++
 arch/ia64/kernel/ia64_ksyms.c |    3 +
 arch/x86/include/asm/crash.h  |   75 ++++++++++++++++++++++++
 arch/x86/mm/ioremap.c         |    2 +
- drivers/char/Kconfig          |    2 +
+ drivers/char/Kconfig          |    3 +
 drivers/char/Makefile         |    2 +
 drivers/char/crash.c          |  128 +++++++++++++++++++++++++++++++++++++++++
- 7 files changed, 302 insertions(+), 0 deletions(-)
+ 7 files changed, 303 insertions(+), 0 deletions(-)
 create mode 100644 arch/ia64/include/asm/crash.h
 create mode 100644 arch/x86/include/asm/crash.h
 create mode 100644 drivers/char/crash.c
@ -208,7 +208,7 @@ index 0000000..dfcc006
 +
 +#endif /* _ASM_I386_CRASH_H */
 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index 5eb1ba7..3e525d2 100644
+index be1ef57..ac659f7 100644
 --- a/arch/x86/mm/ioremap.c
 +++ b/arch/x86/mm/ioremap.c
@@ -24,6 +24,8 @@
@ -220,6 +220,30 @@ index 5eb1ba7..3e525d2 100644
 /*
  * Fix up the linear direct mapping of the kernel to avoid cache attribute
  * conflicts.
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 423fd56..e04a561 100644
+--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
+@@ -4,6 +4,9 @@
+ 
+ menu "Character devices"
+ 
+config CRASH
+	tristate "Crash Utility memory driver"
+
+ source "drivers/tty/Kconfig"
+ 
+ config DEVKMEM
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index 32762ba..3d5d525 100644
+--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
+@@ -65,3 +65,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+ js-rtc-y = rtc.o
+ 
+ obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
+
+obj-$(CONFIG_CRASH)            += crash.o
 diff --git a/drivers/char/crash.c b/drivers/char/crash.c
 new file mode 100644
 index 0000000..e5437de
@ -354,29 +378,6 @@ index 0000000..e5437de
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
+-- 
+1.7.6

-diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index ba53ec9..6588b33 100644
--- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -98,3 +98,5 @@ obj-$(CONFIG_RAMOOPS)		+= ramoops.o
- 
- obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
-+
-+obj-$(CONFIG_CRASH)		+= crash.o
-
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 04f8b2d..e8fb997 100644
--- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -4,6 +4,9 @@
- 
- menu "Character devices"
- 
-+config CRASH
-+	tristate "Crash Utility memory driver"
-+
- source "drivers/tty/Kconfig"
- 
- config DEVKMEM
--- a/linux-2.6-intel-iommu-igfx.patch
+++ b/linux-2.6-intel-iommu-igfx.patch
@ -43,8 +43,8 @@ index e7848a0..9914485 100644
 			for io virtual address below 32 bit forcing dual
 diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
 index 4173125..8f36786 100644
--- a/drivers/pci/intel-iommu.c
-+++ b/drivers/pci/intel-iommu.c
+--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -340,7 +340,8 @@ int dmar_disabled = 0;
 int dmar_disabled = 1;
 #endif /*CONFIG_DMAR_DEFAULT_ON*/
--- a/linux-2.6-silence-noise.patch
+++ b/linux-2.6-silence-noise.patch
@ -46,8 +46,8 @@ Signed-off-by: Dave Jones <davej@redhat.com>
 +		 * In case of error we but don't return the error code immediately.
 +		 * Below we will return -EPROTONOSUPPORT
 		 */
-		if (err && printk_ratelimit())
-			printk(KERN_ERR "can: request_module "
+-		if (err)
+-			printk_ratelimited(KERN_ERR "can: request_module "
 -			       "(can-proto-%d) failed.\n", protocol);
 
 		cp = can_get_proto(protocol);
--- a/linux-2.6-zd1211rw-fix-invalid-signal-values-from-device.patch
+++ b/linux-2.6-zd1211rw-fix-invalid-signal-values-from-device.patch
@ -1,82 +0,0 @@
-commit 7a1d6564a15183cb5994656040966df09af8390f
-Author: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
-Date:   Mon Jun 20 14:42:28 2011 +0300
-
-    zd1211rw: fix invalid signal values from device
-    
-    Driver uses IEEE80211_HW_SIGNAL_UNSPEC and so signal values reported to
-    mac80211 should be in range 0..100. Sometimes device return out of range
-    values. These out of range values can then trigger warning in
-    cfg80211_inform_bss_frame.
-    
-    This patch adds checks to enforce range returned from driver to
-    mac80211 be in 0..100 range.
-    
-    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
-    Signed-off-by: John W. Linville <linville@tuxdriver.com>
-
-diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zd1211rw/zd_def.h
-index 5463ca9..9a1b013 100644
--- a/drivers/net/wireless/zd1211rw/zd_def.h
-+++ b/drivers/net/wireless/zd1211rw/zd_def.h
-@@ -37,9 +37,15 @@ typedef u16 __nocast zd_addr_t;
- 	if (net_ratelimit()) \
- 		dev_printk_f(KERN_DEBUG, dev, fmt, ## args); \
- } while (0)
-+#  define dev_dbg_f_cond(dev, cond, fmt, args...) ({ \
-+	bool __cond = !!(cond); \
-+	if (unlikely(__cond)) \
-+		dev_printk_f(KERN_DEBUG, dev, fmt, ## args); \
-+})
- #else
- #  define dev_dbg_f(dev, fmt, args...) do { (void)(dev); } while (0)
- #  define dev_dbg_f_limit(dev, fmt, args...) do { (void)(dev); } while (0)
-+#  define dev_dbg_f_cond(dev, cond, fmt, args...) do { (void)(dev); } while (0)
- #endif /* DEBUG */
- 
- #ifdef DEBUG
-diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
-index 5037c8b..5de28bf 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
-+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
-@@ -160,6 +160,22 @@ static int zd_reg2alpha2(u8 regdomain, char *alpha2)
- 	return 1;
- }
- 
-+static int zd_check_signal(struct ieee80211_hw *hw, int signal)
-+{
-+	struct zd_mac *mac = zd_hw_mac(hw);
-+
-+	dev_dbg_f_cond(zd_mac_dev(mac), signal < 0 || signal > 100,
-+			"%s: signal value from device not in range 0..100, "
-+			"but %d.\n", __func__, signal);
-+
-+	if (signal < 0)
-+		signal = 0;
-+	else if (signal > 100)
-+		signal = 100;
-+
-+	return signal;
-+}
-+
- int zd_mac_preinit_hw(struct ieee80211_hw *hw)
- {
- 	int r;
-@@ -461,7 +477,7 @@ static void zd_mac_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
- 	if (i<IEEE80211_TX_MAX_RATES)
- 		info->status.rates[i].idx = -1; /* terminate */
- 
-	info->status.ack_signal = ackssi;
-+	info->status.ack_signal = zd_check_signal(hw, ackssi);
- 	ieee80211_tx_status_irqsafe(hw, skb);
- }
- 
-@@ -982,7 +998,7 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
- 
- 	stats.freq = zd_channels[_zd_chip_get_channel(&mac->chip) - 1].center_freq;
- 	stats.band = IEEE80211_BAND_2GHZ;
-	stats.signal = status->signal_strength;
-+	stats.signal = zd_check_signal(hw, status->signal_strength);
- 
- 	rate = zd_rx_rate(buffer, status);
- 
--- a/linux-2.6.30-no-pcspkr-modalias.patch
+++ b/linux-2.6.30-no-pcspkr-modalias.patch
@ -1,11 +1,12 @@
-diff -up linux-2.6.30.noarch/drivers/input/misc/pcspkr.c.jx linux-2.6.30.noarch/drivers/input/misc/pcspkr.c
--- linux-2.6.30.noarch/drivers/input/misc/pcspkr.c.jx	2009-07-28 16:54:44.000000000 -0400
-+++ linux-2.6.30.noarch/drivers/input/misc/pcspkr.c	2009-07-28 16:59:36.000000000 -0400
-@@ -23,7 +23,6 @@
+diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
+index 34f4d2e..3e40c70 100644
+--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
+@@ -24,7 +24,6 @@
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("PC Speaker beeper driver");
 MODULE_LICENSE("GPL");
 -MODULE_ALIAS("platform:pcspkr");
 
- #if defined(CONFIG_MIPS) || defined(CONFIG_X86)
- /* Use the global PIT lock ! */
+ static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+ {
--- a/rcu-avoid-just-onlined-cpu-resched.patch
+++ b/rcu-avoid-just-onlined-cpu-resched.patch
@ -0,0 +1,47 @@
+rcu: Avoid having just-onlined CPU resched itself when RCU is idle
+
+CPUs set rdp->qs_pending when coming online to resolve races with
+grace-period start.  However, this means that if RCU is idle, the
+just-onlined CPU might needlessly send itself resched IPIs.  Adjust
+the online-CPU initialization to avoid this, and also to correctly
+cause the CPU to respond to the current grace period if needed.
+
+Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+---
+ kernel/rcutree.c |   13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/kernel/rcutree.c b/kernel/rcutree.c
+index ba06207..472d6b2 100644
+--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
+@@ -1865,8 +1865,6 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
+ 
+ 	/* Set up local state, ensuring consistent view of global state. */
+ 	raw_spin_lock_irqsave(&rnp->lock, flags);
+-	rdp->passed_quiesc = 0;  /* We could be racing with new GP, */
+-	rdp->qs_pending = 1;	 /*  so set up to respond to current GP. */
+ 	rdp->beenonline = 1;	 /* We have now been online. */
+ 	rdp->preemptible = preemptible;
+ 	rdp->qlen_last_fqs_check = 0;
+@@ -1891,8 +1889,15 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
+ 		rnp->qsmaskinit |= mask;
+ 		mask = rnp->grpmask;
+ 		if (rnp == rdp->mynode) {
+-			rdp->gpnum = rnp->completed; /* if GP in progress... */
+-			rdp->completed = rnp->completed;
+			/*
+			 * If there is a grace period in progress, we will
+			 * set up to wait for it next time we run the
+			 * RCU core code.
+			 */
+			rdp->gpnum = rnp->completed;
+ 			rdp->completed = rnp->completed;
+			rdp->passed_quiesc = 0;
+			rdp->qs_pending = 0;
+ 			rdp->passed_quiesc_completed = rnp->completed - 1;
+ 		}
+ 		raw_spin_unlock(&rnp->lock); /* irqs already disabled. */
+-- 
+1.7.6
+
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
-ac49f7907f1fc85fbab92d0f1aa1552a  patch-3.0.1.bz2
+f358c354ab6d3b0da1265b504f85ec50  patch-3.1-rc2.bz2
--- a/ums-realtek-driver-uses-stack-memory-for-DMA.patch
+++ b/ums-realtek-driver-uses-stack-memory-for-DMA.patch
@ -1,22 +1,69 @@
-commit 82e632009bb7d6b97f8cabe9918c82703f4e5cd2
-Author: Josh Boyer <jwboyer@redhat.com>
-Date:   Tue Aug 2 08:37:53 2011 -0400
+From patchwork Tue Aug  2 05:04:11 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: ums-realtek driver uses stack memory for DMA
+Date: Tue, 02 Aug 2011 05:04:11 -0000
+From: Adam Cozzette <acozzette@cs.hmc.edu>
+X-Patchwork-Id: 1028062
+Message-Id: <20110802050411.GC3857@[192.168.0.12]>
+To: Josh Boyer <jwboyer@redhat.com>
+Cc: edwin_rong <edwin_rong@realsil.com.cn>, wwang <wei_wang@realsil.com.cn>, 
+ Greg Kroah-Hartman <gregkh@suse.de>, linux-usb@vger.kernel.org,
+ linux-kernel@vger.kernel.org

-    This patch changed rts51x_read_mem, rts51x_write_mem, and rts51x_read_status to
-    allocate temporary buffers with kmalloc. This way stack addresses are not used
-    for DMA when these functions call rts51x_bulk_transport.
-    
-    Signed-off-by: Adam Cozzette <acozzette@cs.hmc.edu>
-    Backported-by: Josh Boyer <jwboyer@redhat.com>
+On Mon, Aug 01, 2011 at 05:09:06PM -0400, Josh Boyer wrote:
+> Hello,
+> 
+> We have a report that the ums-realtek driver is generating a backtrace
+> due to using stack variables for DMA buffers.  The backtrace is below
+> and you can view the bug report here:
+> https://bugzilla.redhat.com/show_bug.cgi?id=720054
+> 
+> Looking through the code, it seems that every call to rts51x_read_mem,
+> rts51x_write_mem, and rts51x_read_status passes a stack variable to
+> rts51x_bulk_transport, which then calls usb_stor_bulk_transfer_buf with
+> this and generates the backtrace.  It is my understanding that the
+> driver should be passing variables that are not on the stack and have
+> been allocated with memory that will be suitable for the DMA api (e.g.
+> kmalloc).
+> 
+> Was this missed during the initial review and is anyone working on
+> adapting the driver to be compliant?
+
+Could you try out this patch if it looks ok to you? I have not tested it because
+unfortunately I don't have the hardware. Right now it generates some compile
+warnings like this one:
+
+drivers/usb/storage/realtek_cr.c:419:40: warning: ‘buf[0]’ may be used uninitialized in this function [-Wuninitialized]
+
+It think they are harmless but I didn't see an obvious way to get rid of them,
+so if you have any suggestions I would be glad to hear them.
+
+This patch changed rts51x_read_mem, rts51x_write_mem, and rts51x_read_status to
+allocate temporary buffers with kmalloc. This way stack addresses are not used
+for DMA when these functions call rts51x_bulk_transport.
+
+Signed-off-by: Adam Cozzette <acozzette@cs.hmc.edu>
+
+---
+realtek_cr.c |   35 ++++++++++++++++++++++++++++++-----
+ 1 file changed, 30 insertions(+), 5 deletions(-)
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/

 diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
-index d509a4a..69a1bd3 100644
+index 34adc4b..232167a 100644
 --- a/drivers/usb/storage/realtek_cr.c
 +++ b/drivers/usb/storage/realtek_cr.c
-@@ -285,6 +285,11 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+@@ -320,6 +320,11 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
 {
 	int retval;
- 	u8 cmnd[12] = {0};
+ 	u8 cmnd[12] = { 0 };
 +	u8 *buf;
 +
 +	buf = kmalloc(len, GFP_NOIO);
@ -25,8 +72,8 @@ index d509a4a..69a1bd3 100644
 
 	US_DEBUGP("%s, addr = 0x%x, len = %d\n", __func__, addr, len);
 
-@@ -296,10 +301,14 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
- 	cmnd[5] = (u8)len;
+@@ -331,10 +336,14 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+ 	cmnd[5] = (u8) len;
 
 	retval = rts51x_bulk_transport(us, 0, cmnd, 12,
 -				       data, len, DMA_FROM_DEVICE, NULL);
@ -42,10 +89,10 @@ index d509a4a..69a1bd3 100644
 	return 0;
 }
 
-@@ -307,6 +316,12 @@ static int rts51x_write_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+@@ -342,6 +351,12 @@ static int rts51x_write_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
 {
 	int retval;
- 	u8 cmnd[12] = {0};
+ 	u8 cmnd[12] = { 0 };
 +	u8 *buf;
 +
 +	buf = kmalloc(len, GFP_NOIO);
@ -55,8 +102,8 @@ index d509a4a..69a1bd3 100644
 
 	US_DEBUGP("%s, addr = 0x%x, len = %d\n", __func__, addr, len);
 
-@@ -318,7 +333,8 @@ static int rts51x_write_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
- 	cmnd[5] = (u8)len;
+@@ -353,7 +368,8 @@ static int rts51x_write_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+ 	cmnd[5] = (u8) len;
 
 	retval = rts51x_bulk_transport(us, 0, cmnd, 12,
 -				       data, len, DMA_TO_DEVICE, NULL);
@ -65,10 +112,10 @@ index d509a4a..69a1bd3 100644
 	if (retval != USB_STOR_TRANSPORT_GOOD)
 		return -EIO;
 
-@@ -330,6 +346,11 @@ static int rts51x_read_status(struct us_data *us,
+@@ -365,6 +381,11 @@ static int rts51x_read_status(struct us_data *us,
 {
 	int retval;
- 	u8 cmnd[12] = {0};
+ 	u8 cmnd[12] = { 0 };
 +	u8 *buf;
 +
 +	buf = kmalloc(len, GFP_NOIO);
@ -77,7 +124,7 @@ index d509a4a..69a1bd3 100644
 
 	US_DEBUGP("%s, lun = %d\n", __func__, lun);
 
-@@ -337,10 +358,14 @@ static int rts51x_read_status(struct us_data *us,
+@@ -372,10 +393,14 @@ static int rts51x_read_status(struct us_data *us,
 	cmnd[1] = 0x09;
 
 	retval = rts51x_bulk_transport(us, lun, cmnd, 12,
--- a/utrace.patch
+++ b/utrace.patch