[kernel] Linux 3.1-git1 (138c4ae9cfda upstream)

Josh Boyer jwboyer at fedoraproject.org
Thu Oct 27 01:36:31 UTC 2011 

commit 34f9218fe519cd922889076cc7698bd73bdb9f92
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Oct 26 18:23:52 2011 -0400

    Linux 3.1-git1 (138c4ae9cfda upstream)
    
    First take on the upcomming Linux 3.2 kernel.  The moving of the ethernet
    drivers into vendor subdirectories caused a lot of churn in config-generic, but
    hopefully it's a bit cleaner now.

 add-appleir-usb-driver.patch                       |  701 --------------------
 add-macbookair41-keyboard.patch                    |  119 ----
 ...member-vlan-pkts-not-received-in-promisco.patch |   63 --
 benet-remove-bogus-unlikely-on-vlan-check.patch    |   39 --
 config-arm-generic                                 |    1 +
 config-arm-omap-generic                            |   13 +-
 config-arm-tegra                                   |    3 +
 config-generic                                     |  332 ++++++----
 config-ia64-generic                                |    4 +-
 config-powerpc-generic                             |    7 +
 config-powerpc32-generic                           |    3 +
 config-s390x                                       |    2 +
 config-x86-generic                                 |    6 +-
 config-x86_64-generic                              |    2 +-
 epoll-fix-spurious-lockdep-warnings.patch          |    3 +
 epoll-limit-paths.patch                            |    8 +-
 ...gn-fix-ht_params-NULL-pointer-dereference.patch |   43 --
 kernel.spec                                        |   37 +-
 linux-2.6-debug-taint-vm.patch                     |   35 +-
 linux-2.6-e1000-ich9-montevina.patch               |   28 +-
 linux-2.6-intel-iommu-igfx.patch                   |   33 +-
 rcu-avoid-just-onlined-cpu-resched.patch           |   47 --
 rcutree-avoid-false-quiescent-states.patch         |   67 --
 select-regmap-from-wm8400.patch                    |   81 +++
 sources                                            |    1 +
 ums-realtek-driver-uses-stack-memory-for-DMA.patch |  143 ----
 usb-add-quirk-for-logitech-webcams.patch           |   76 +--
 27 files changed, 415 insertions(+), 1482 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 307c66d..a41f954 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -142,6 +142,7 @@ CONFIG_SPARSE_IRQ=y
 
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 
+CONFIG_NET_VENDOR_FARADAY=y
 CONFIG_FTMAC100=m
 
 CONFIG_HWSPINLOCK_OMAP=m
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index e396169..ebfafa4 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -133,6 +133,9 @@ CONFIG_ARM_GIC=y
 # CONFIG_PCCARD is not set
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
 CONFIG_HAVE_ARM_SCU=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_NR_CPUS=2
@@ -290,6 +293,9 @@ CONFIG_EEPROM_93XX46=m
 CONFIG_DM_MULTIPATH=y
 # CONFIG_TARGET_CORE is not set
 # CONFIG_MACVTAP is not set
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_MICROCHIP=y
 CONFIG_MII=y
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
@@ -322,14 +328,13 @@ CONFIG_SMSC911X=y
 # CONFIG_DNET is not set
 # CONFIG_B44 is not set
 CONFIG_KS8851=m
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
 # CONFIG_ATH9K_HTC is not set
 # CONFIG_AR9170_USB is not set
 # CONFIG_B43_SDIO is not set
 # CONFIG_B43_PHY_N is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_MESH is not set
 CONFIG_P54_SPI=m
@@ -489,6 +494,7 @@ CONFIG_GPIO_TWL4030=y
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADCXX is not set
@@ -886,6 +892,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_R8A66597 is not set
@@ -893,6 +900,7 @@ CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_RENESAS_USBHS is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 CONFIG_USB_ETH=y
@@ -900,6 +908,7 @@ CONFIG_USB_ETH_RNDIS=y
 CONFIG_USB_ETH_EEM=y
 # CONFIG_USB_G_NCM is not set
 # CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_DWC3 is not set
 # CONFIG_USB_FUNCTIONFS is not set
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_MASS_STORAGE is not set
diff --git a/config-arm-tegra b/config-arm-tegra
index 910b39f..0642df0 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -43,6 +43,9 @@ CONFIG_ARM_ERRATA_720789=y
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
 CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
 CONFIG_LOCAL_TIMERS=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_HW_PERF_EVENTS=y
diff --git a/config-generic b/config-generic
index 9b81856..491933d 100644
--- a/config-generic
+++ b/config-generic
@@ -1218,45 +1218,48 @@ CONFIG_L2TP_ETH=m
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=y
 
+CONFIG_NFC_NCI=m
+
 #
 # Ethernet (10 or 100Mbit)
 #
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
-CONFIG_NET_ETHERNET=y
-CONFIG_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_MDIO_BITBANG=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_BCM63XX_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_VITESSE_PHY=m
-CONFIG_MICREL_PHY=m
 
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_DNET=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-# CONFIG_STMMAC_DUAL_MAC is not set
-# CONFIG_STMMAC_TIMER is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
 
-# CONFIG_PCH_GBE is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_LANCE is not set
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_PCMCIA_NMCLAN=m
+
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1C=m
+CONFIG_ATL1E=m
+
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+
+# CONFIG_NET_VENDOR_CIRRUS is not set
+#
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_EWRK3=m
 #
 # Tulip family network device support
 #
@@ -1273,109 +1276,186 @@ CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_ULI526X=m
-# CONFIG_HP100 is not set
-CONFIG_LNE390=m
-CONFIG_NE3210=m
-CONFIG_ES3210=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI=y
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1C=m
-CONFIG_ATL2=m
-CONFIG_ATL1E=m
+
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_FUJITSU is not set
+# CONFIG_NET_VENDOR_HP is not set
+CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_FORCEDETH=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBEVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
+
+# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KSZ884X_PCI=m
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
+
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+
+CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_AC3200 is not set
+CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_PCMCIA_PCNET=m
+
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_PCH_GBE is not set
+
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_SC92031=m
+
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+
+# CONFIG_NET_VENDOR_SEEQ is not set
+
+CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
+
+CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_SMC9194 is not set
+CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
-CONFIG_SC92031=m
 CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+# CONFIG_STMMAC_DUAL_MAC is not set
+# CONFIG_STMMAC_TIMER is not set
+# CONFIG_STMMAC_DEBUG_FS is not set
+
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+
+CONFIG_NET_VENDOR_TI=y
 CONFIG_TLAN=m
+
+CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
+
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+
+CONFIG_PHYLIB=y
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_FIXED_PHY=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_VITESSE_PHY=m
+CONFIG_MICREL_PHY=m
+
+CONFIG_MII=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_DNET=m
+
+
+CONFIG_LNE390=m
+CONFIG_ES3210=m
+CONFIG_NET_PCI=y
+CONFIG_B44=m
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_FEALNX=m
 CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_CASSINI=m
 CONFIG_ETHOC=m
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851_MLL is not set
 
 #
 # Ethernet (1000 Mbit)
 #
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-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
 CONFIG_JME=m
 
 #
 # Ethernet (10000 Mbit)
 #
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
 CONFIG_IP1000=m
-CONFIG_IXGB=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_DCB=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_TEHUTI=m
-CONFIG_ENIC=m
 CONFIG_MLX4_EN=m
 # CONFIG_MLX4_DEBUG is not set
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1444,6 +1524,8 @@ CONFIG_ATH_COMMON=m
 CONFIG_ATH5K=m
 CONFIG_ATH5K_DEBUG=y
 # CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_DEBUG=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
@@ -1454,6 +1536,7 @@ CONFIG_ATH9K_HTC=m
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_HWRNG is not set
 CONFIG_AT76C50X_USB=m
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
@@ -1465,6 +1548,7 @@ CONFIG_B43_BCMA=y
 CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_HT=y
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_DEBUG=y
@@ -1572,6 +1656,7 @@ CONFIG_RTL8192DE=m
 
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
 
 #
 # Token Ring devices
@@ -1601,11 +1686,6 @@ CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
 CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
 
 #
 # Amateur Radio support
@@ -1616,13 +1696,16 @@ CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCMCIA=m
 CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_KVASER_PCI=m
@@ -2060,6 +2143,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_DW is not set
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
 # CONFIG_MOXA_INTELLIO is not set
@@ -2269,12 +2353,14 @@ CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_EMC6W201=m
 
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MAX1668=m
@@ -3101,6 +3187,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_ENE_UB6250=m
 # CONFIG_USB_LIBUSUAL is not set
 CONFIG_USB_UAS=m
@@ -3118,6 +3205,7 @@ CONFIG_HID=m
 CONFIG_HIDRAW=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGIWII_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
@@ -3131,10 +3219,12 @@ CONFIG_DRAGONRISE_FF=y
 CONFIG_GREENASIA_FF=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=y
 CONFIG_HID_QUANTA=y
+CONFIG_HID_PRIMAX=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_GYRATION=m
@@ -3154,7 +3244,6 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
-CONFIG_HID_ACRUX_FF=m
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_UCLOGIC=m
@@ -3162,6 +3251,7 @@ CONFIG_HID_WALTOP=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_ROCCAT_KONEPLUS=m
 CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_ROCCAT_ARVO=m
@@ -3394,6 +3484,7 @@ CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
 # CONFIG_USB_GADGET is not set
+# CONFIG_USB_DWC3 is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -3918,6 +4009,7 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -4001,35 +4093,19 @@ CONFIG_SCSI_ARCMSR_AER=y
 
 # CONFIG_EL1 is not set
 # CONFIG_EL2 is not set
-# CONFIG_ELPLUS is not set
-# CONFIG_EL16 is not set
 CONFIG_EL3=m
 # CONFIG_3C515 is not set
-# CONFIG_LANCE is not set
 CONFIG_NET_VENDOR_SMC=y
 # CONFIG_WD80x3 is not set
 CONFIG_ULTRA=m
-# CONFIG_SMC9194 is not set
 # CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
-# CONFIG_AT1700 is not set
 # CONFIG_DEPCA is not set
 CONFIG_NET_ISA=y
 CONFIG_NE2000=m
 # CONFIG_E2100 is not set
-CONFIG_EWRK3=m
-# CONFIG_EEXPRESS is not set
-# CONFIG_EEXPRESS_PRO is not set
 # CONFIG_HPLAN_PLUS is not set
 # CONFIG_HPLAN is not set
-# CONFIG_LP486E is not set
-# CONFIG_ETH16I is not set
-# CONFIG_ZNET is not set
-# CONFIG_SEEQ8005 is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_CS89x0 is not set
 # CONFIG_IBMTR is not set
 # CONFIG_SKISA is not set
 # CONFIG_PROTEON is not set
@@ -4250,7 +4326,6 @@ CONFIG_LIRC_TTUSBIR=m
 # CONFIG_DEVKMEM is not set
 
 CONFIG_PM_TRACE_RTC=y
-CONFIG_R6040=m
 
 CONFIG_BNX2X=m
 CONFIG_SCSI_BNX2X_FCOE=m
@@ -4298,6 +4373,7 @@ CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_HP_ILO is not set
 
 # CONFIG_GPIOLIB is not set
+# CONFIG_PINCTRL is not set
 
 
 CONFIG_NETFILTER_TPROXY=m
@@ -4400,6 +4476,8 @@ CONFIG_USB_ATMEL=m
 # CONFIG_BRCMFMAC is not set
 # CONFIG_INTEL_MEI is not set
 # CONFIG_ZCACHE is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_NVEC_LEDS is not set
 
 #
 # Android
@@ -4426,6 +4504,8 @@ CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_AUDIT=y
 CONFIG_IMA_LSM_RULES=y
 
+# CONFIG_EVM is not set
+
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
 # CONFIG_PAGE_POISONING is not set
@@ -4448,6 +4528,7 @@ CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 
@@ -4552,6 +4633,7 @@ CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 
 CONFIG_PN544_NFC=m
 CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
 
 CONFIG_TARGET_CORE=m
 CONFIG_ISCSI_TARGET=m
diff --git a/config-ia64-generic b/config-ia64-generic
index 1fa386d..f1fa705 100644
--- a/config-ia64-generic
+++ b/config-ia64-generic
@@ -13,7 +13,7 @@ CONFIG_EFI=y
 # CONFIG_ITANIUM is not set
 CONFIG_MCKINLEY=y
 CONFIG_IA64_GENERIC=y
-CONFIG_DMAR=y
+CONFIG_INTEL_IOMMU=y
 # CONFIG_IA64_DIG is not set
 # CONFIG_IA64_HP_ZX1 is not set
 # CONFIG_IA64_SGI_SN2 is not set
@@ -195,7 +195,7 @@ CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 
-CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
 
 CONFIG_RCU_FANOUT=64
 
diff --git a/config-powerpc-generic b/config-powerpc-generic
index ee9ab24..05f85f8 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -225,6 +225,7 @@ CONFIG_EXTRA_TARGETS=""
 # CONFIG_SERIAL_QE is not set
 # CONFIG_I2C_CPM is not set
 
+CONFIG_NET_VENDOR_IBM=y
 
 CONFIG_SERIO_XILINX_XPS_PS2=m
 
@@ -355,3 +356,9 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set
 
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_IBM_EMAC is not set
+# CONFIG_NET_VENDOR_PASEMI is not set
+# CONFIG_NET_VENDOR_TOSHIBA is not set
diff --git a/config-powerpc32-generic b/config-powerpc32-generic
index 31c399e..6cf06ac 100644
--- a/config-powerpc32-generic
+++ b/config-powerpc32-generic
@@ -41,6 +41,7 @@ CONFIG_ADB_PMU_LED=y
 CONFIG_ADB_PMU_LED_IDE=y
 
 CONFIG_PMAC_MEDIABAY=y
+CONFIG_NET_VENDOR_APPLE=y
 CONFIG_BMAC=m
 CONFIG_MACE=m
 # CONFIG_MACE_AAUI_PORT is not set
@@ -86,6 +87,7 @@ CONFIG_8xxx_WDT=m
 CONFIG_GEF_WDT=m
 
 CONFIG_PPC_MPC5200_BUGFIX=y
+CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC_MPC52xx=m
 #CHECK: This may later become a tristate.
 CONFIG_FEC_MPC52xx_MDIO=y
@@ -185,3 +187,4 @@ CONFIG_KVM_BOOK3S_32=m
 # CONFIG_SCSI_QLA_ISCSI is not set
 
 CONFIG_BATTERY_PMU=m
+
diff --git a/config-s390x b/config-s390x
index 5251b5b..f039421 100644
--- a/config-s390x
+++ b/config-s390x
@@ -237,3 +237,5 @@ CONFIG_STRICT_DEVMEM=y
 # CONFIG_WARN_DYNAMIC_STACK is not set
 
 CONFIG_CRYPTO_GHASH_S390=m
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
diff --git a/config-x86-generic b/config-x86-generic
index 2e4cc0a..8885773 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -36,10 +36,10 @@ CONFIG_FB_EFI=y
 # FIXME: 32bit only?
 # CONFIG_FB_N411 is not set
 
-CONFIG_DMAR=y
+CONFIG_INTEL_IOMMU=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
-CONFIG_DMAR_FLOPPY_WA=y
-CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
 CONFIG_SCSI_ADVANSYS=m
 
 CONFIG_SECCOMP=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 6471029..49448bd 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -95,7 +95,7 @@ CONFIG_DIRECT_GBPAGES=y
 CONFIG_X86_MPPARSE=y
 
 CONFIG_I7300_IDLE=m
-CONFIG_INTR_REMAP=y
+CONFIG_IRQ_REMAP=y
 
 CONFIG_X86_X2APIC=y
 CONFIG_SPARSE_IRQ=y
diff --git a/epoll-fix-spurious-lockdep-warnings.patch b/epoll-fix-spurious-lockdep-warnings.patch
index c163a86..7ca7703 100644
--- a/epoll-fix-spurious-lockdep-warnings.patch
+++ b/epoll-fix-spurious-lockdep-warnings.patch
@@ -1,3 +1,6 @@
+From: Nelson Elhage <nelhage at nelhage.com>
+Subject: epoll: fix suprious lockdep warnings
+
 epoll can acquire multiple ep->mutex on multiple "struct eventpoll"s
 at once in the case where one epoll fd is monitoring another epoll
 fd. This is perfectly OK, since we're careful about the lock ordering,
diff --git a/epoll-limit-paths.patch b/epoll-limit-paths.patch
index 440db27..4ed306a 100644
--- a/epoll-limit-paths.patch
+++ b/epoll-limit-paths.patch
@@ -1,4 +1,4 @@
-From 6a4ca79652219cf22da800d990e5b46feaea1ad9 Mon Sep 17 00:00:00 2001
+From 0a6cc45426fe3baaf231efd7efe4300fd879efc8 Mon Sep 17 00:00:00 2001
 From: Jason Baron <jbaron at redhat.com>
 Date: Mon, 24 Oct 2011 14:59:02 +1100
 Subject: [PATCH] epoll: limit paths
@@ -91,7 +91,7 @@ Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
  3 files changed, 203 insertions(+), 25 deletions(-)
 
 diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index 4a53743..414ac74 100644
+index b84fad9..414ac74 100644
 --- a/fs/eventpoll.c
 +++ b/fs/eventpoll.c
 @@ -197,6 +197,12 @@ struct eventpoll {
@@ -137,7 +137,7 @@ index 4a53743..414ac74 100644
  	.llseek		= noop_llseek,
  };
  
--/* Fast test to see if the file is an evenpoll file */
+-/* Fast test to see if the file is an eventpoll file */
 -static inline int is_file_epoll(struct file *f)
 -{
 -	return f->f_op == &eventpoll_fops;
@@ -449,7 +449,7 @@ index f362733..657ab55 100644
  
  
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 277f497..93778e0 100644
+index ba98668..d393a68 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -985,6 +985,7 @@ struct file {
diff --git a/kernel.spec b/kernel.spec
index eba49da..178c611 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 1
+%global released_kernel 0
 
 # Save original buildid for later if it's defined
 %if 0%{?buildid:1}
@@ -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 5
+%global baserelease 0
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -82,7 +82,7 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 10
+%define rcrev 0
 # The git snapshot level
 %define gitrev 1
 # Set rpm version accordingly
@@ -688,23 +688,17 @@ Patch2903: media-DiBcom-protect-the-I2C-bufer-access.patch
 Patch2904: media-dib0700-protect-the-dib0700-buffer-access.patch
 Patch2905: media-dib0700-correct-error-message.patch
 
-Patch3000: rcutree-avoid-false-quiescent-states.patch
-
 # fs fixes
 
 # NFSv4
 
 # patches headed upstream
-Patch12010: add-appleir-usb-driver.patch
-
 Patch12016: disable-i8042-check-on-apple-mac.patch
 
 Patch12021: udlfb-bind-framebuffer-to-interface.patch
 Patch12022: x86-efi-Calling-__pa-with-an-ioremap-address-is-invalid.patch
 
-Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.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
 Patch12029: crypto-register-cryptd-first.patch
@@ -715,13 +709,10 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
 Patch13002: revert-efi-rtclock.patch
 Patch13003: efi-dont-map-boot-services-on-32bit.patch
 
-Patch13007: add-macbookair41-keyboard.patch
-
 Patch13009: hvcs_pi_buf_alloc.patch
 
 Patch13013: powerpc-Fix-deadlock-in-icswx-code.patch
-
-Patch13014: iwlagn-fix-ht_params-NULL-pointer-dereference.patch
+Patch13014: select-regmap-from-wm8400.patch
 
 Patch20000: utrace.patch
 
@@ -736,10 +727,6 @@ Patch21002: mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
 Patch21020: 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
 Patch21021: 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
 
-#rhbz 748691
-Patch21030: be2net-non-member-vlan-pkts-not-received-in-promisco.patch
-Patch21031: benet-remove-bogus-unlikely-on-vlan-check.patch
-
 #rhbz 749166
 Patch21050: xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
 
@@ -1309,17 +1296,11 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-update.patch
 ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
 
 # Patches headed upstream
-ApplyPatch rcutree-avoid-false-quiescent-states.patch
-
 ApplyPatch disable-i8042-check-on-apple-mac.patch
 
-ApplyPatch add-appleir-usb-driver.patch
-
 ApplyPatch udlfb-bind-framebuffer-to-interface.patch
-ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
 ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
 ApplyPatch epoll-limit-paths.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
 
@@ -1333,14 +1314,11 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 ApplyPatch revert-efi-rtclock.patch
 ApplyPatch efi-dont-map-boot-services-on-32bit.patch
 
-ApplyPatch add-macbookair41-keyboard.patch
 
 ApplyPatch hvcs_pi_buf_alloc.patch
 
 ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
 
-ApplyPatch iwlagn-fix-ht_params-NULL-pointer-dereference.patch
-
 #rhbz #722509
 ApplyPatch mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
 
@@ -1355,9 +1333,7 @@ ApplyPatch utrace.patch
 ApplyPatch 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
 ApplyPatch 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
 
-#rhbz 748691
-ApplyPatch be2net-non-member-vlan-pkts-not-received-in-promisco.patch
-ApplyPatch benet-remove-bogus-unlikely-on-vlan-check.patch
+ApplyPatch select-regmap-from-wm8400.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2041,6 +2017,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Oct 26 2011 Josh Boyer <jwboyer at redhat.com>
+- Linux 3.1-git1
+
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-5
 - Rebuilt for glibc bug#747377
 
diff --git a/linux-2.6-debug-taint-vm.patch b/linux-2.6-debug-taint-vm.patch
index 672509d..ab70317 100644
--- a/linux-2.6-debug-taint-vm.patch
+++ b/linux-2.6-debug-taint-vm.patch
@@ -1,5 +1,17 @@
+From 77c78bac236c7b07d390be65f357c85a79cce890 Mon Sep 17 00:00:00 2001
+From: Dave Jones <davej at redhat.com>
+Date: Wed, 26 Oct 2011 18:44:26 -0400
+Subject: [PATCH] Add more debugging information to the VM subsystem
+
+Dump modules in bad_page, and print taint information in other areas
+---
+ mm/page_alloc.c |    1 +
+ mm/slab.c       |    8 ++++----
+ mm/slub.c       |    2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 4e8985a..70d0853 100644
+index 6e8ecb6..83a0205 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -318,6 +318,7 @@ static void bad_page(struct page *page)
@@ -11,10 +23,10 @@ index 4e8985a..70d0853 100644
  out:
  	/* Leave bad fields for debug, except PageBuddy could make trouble */
 diff --git a/mm/slab.c b/mm/slab.c
-index d96e223..6f8905b 100644
+index 708efe8..114a66d 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
-@@ -1886,8 +1886,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
+@@ -1927,8 +1927,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
@@ -25,22 +37,22 @@ index d96e223..6f8905b 100644
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2985,8 +2985,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -3037,8 +3037,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
 -				"cache '%s'(%d), slabp %p(%d). Hexdump:\n",
 -			cachep->name, cachep->num, slabp, slabp->inuse);
-+				"cache '%s'(%d), slabp %p(%d). Tainted(%s). Hexdump:\n",
++				"cache '%s'(%d), slabp %p(%d). Tainted(%s) Hexdump:\n",
 +			cachep->name, cachep->num, slabp, slabp->inuse, print_tainted());
- 		for (i = 0;
- 		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
- 		     i++) {
+ 		print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, slabp,
+ 			sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t),
+ 			1);
 diff --git a/mm/slub.c b/mm/slub.c
-index 35f351f..e7ccb39 100644
+index 95215aa..bbec29e 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -472,7 +472,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -570,7 +570,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");
@@ -49,3 +61,6 @@ index 35f351f..e7ccb39 100644
  	printk(KERN_ERR "----------------------------------------"
  			"-------------------------------------\n\n");
  }
+-- 
+1.7.6.4
+
diff --git a/linux-2.6-e1000-ich9-montevina.patch b/linux-2.6-e1000-ich9-montevina.patch
index d45fd56..ec38a39 100644
--- a/linux-2.6-e1000-ich9-montevina.patch
+++ b/linux-2.6-e1000-ich9-montevina.patch
@@ -1,11 +1,22 @@
+From 802e6d8c8477a553a677b23a247d6d2638e01958 Mon Sep 17 00:00:00 2001
+From: Dave Jones <davej at redhat.com>
+Date: Wed, 26 Oct 2011 13:31:47 -0400
+Subject: [PATCH] e1000e: ich9 montevina
+
 This only showed up in one SDV (Montevina).
 The PCIE slots don't seem to like network cards, so this is the only hope
 to get networking working.  It's never going upstream, but it's low impact
 enough to carry just to keep those SDVs working.
+---
+ drivers/net/ethernet/intel/e1000e/ich8lan.c |    6 ++++++
+ drivers/net/ethernet/intel/e1000e/netdev.c  |    1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
 
---- linux-2.6.35.noarch/drivers/net/e1000e/ich8lan.c~	2010-09-29 17:53:13.000000000 -0400
-+++ linux-2.6.35.noarch/drivers/net/e1000e/ich8lan.c	2010-09-29 17:54:00.000000000 -0400
-@@ -424,6 +424,12 @@ static s32 e1000_init_phy_params_ich8lan
+diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+index 6a17c62..0e40975 100644
+--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+@@ -452,6 +452,12 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
  
  	/* Verify phy id */
  	switch (phy->id) {
@@ -18,9 +29,11 @@ enough to carry just to keep those SDVs working.
  	case IGP03E1000_E_PHY_ID:
  		phy->type = e1000_phy_igp_3;
  		phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
---- linux-2.6.35.noarch/drivers/net/e1000e/netdev.c~	2010-09-29 17:54:07.000000000 -0400
-+++ linux-2.6.35.noarch/drivers/net/e1000e/netdev.c	2010-09-29 17:54:29.000000000 -0400
-@@ -5994,6 +5994,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
+index a855db1..edac30b 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -6359,6 +6359,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
  	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
  	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
  	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
@@ -28,3 +41,6 @@ enough to carry just to keep those SDVs working.
  
  	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
  	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },
+-- 
+1.7.6.4
+
diff --git a/linux-2.6-intel-iommu-igfx.patch b/linux-2.6-intel-iommu-igfx.patch
index b2f8f19..d54ae3c 100644
--- a/linux-2.6-intel-iommu-igfx.patch
+++ b/linux-2.6-intel-iommu-igfx.patch
@@ -1,6 +1,7 @@
-Subject: [PATCH] [intel_iommu] Default to igfx_off
+From e13491e4c394907ffdd834aeccca279213818079 Mon Sep 17 00:00:00 2001
 From: drago01 <drago01 at gmail.com>
-To: fedora-kernel-list <fedora-kernel-list at redhat.com>
+Date: Wed, 26 Oct 2011 13:37:27 -0400
+Subject: [PATCH] Default to igfx_off
 
 This option seems to causes way to many issues, it is
 being investigated by Intel's chipset team for months now and
@@ -16,14 +17,14 @@ Signed-off-by: Adel Gadllah <adel.gadllah at gmail.com>
 Reviewed-by: Adam Jackson <ajax at redhat.com>
 ---
  Documentation/kernel-parameters.txt |   11 +++++------
- drivers/pci/intel-iommu.c           |    9 +++++----
+ drivers/iommu/intel-iommu.c         |    9 +++++----
  2 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index e7848a0..9914485 100644
+index a8ba119..8ddc43a 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -992,12 +992,11 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -998,12 +998,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			Enable intel iommu driver.
  		off
  			Disable intel iommu driver.
@@ -40,22 +41,22 @@ index e7848a0..9914485 100644
 +			mapped as normal device.
  		forcedac [x86_64]
  			With this option iommu will not optimize to look
- 			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
+ 			for io virtual address below 32-bit forcing dual
+diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
+index be1953c..2e23af1 100644
 --- a/drivers/iommu/intel-iommu.c
 +++ b/drivers/iommu/intel-iommu.c
-@@ -340,7 +340,8 @@ int dmar_disabled = 0;
+@@ -404,7 +404,8 @@ int dmar_disabled = 0;
  int dmar_disabled = 1;
- #endif /*CONFIG_DMAR_DEFAULT_ON*/
-
+ #endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/
+ 
 -static int dmar_map_gfx = 1;
 +/* disabled by default; causes way too many issues */
 +static int dmar_map_gfx = 0;
  static int dmar_forcedac;
  static int intel_iommu_strict;
-
-@@ -361,10 +362,10 @@ static int __init intel_iommu_setup(char *str)
+ static int intel_iommu_superpage = 1;
+@@ -429,10 +430,10 @@ static int __init intel_iommu_setup(char *str)
  		} else if (!strncmp(str, "off", 3)) {
  			dmar_disabled = 1;
  			printk(KERN_INFO "Intel-IOMMU: disabled\n");
@@ -70,9 +71,5 @@ index 4173125..8f36786 100644
  			printk(KERN_INFO
  				"Intel-IOMMU: Forcing DAC for PCI devices\n");
 -- 
-1.6.6.1
-_______________________________________________
-kernel mailing list
-kernel at lists.fedoraproject.org
-https://admin.fedoraproject.org/mailman/listinfo/kernel
+1.7.6.4
 
diff --git a/select-regmap-from-wm8400.patch b/select-regmap-from-wm8400.patch
new file mode 100644
index 0000000..eba5b5e
--- /dev/null
+++ b/select-regmap-from-wm8400.patch
@@ -0,0 +1,81 @@
+                                                                                                                                                                                                                                                               
+Delivered-To: jwboyer at gmail.com
+Received: by 10.220.45.11 with SMTP id c11cs78852vcf;
+        Tue, 25 Oct 2011 11:54:49 -0700 (PDT)
+Received: by 10.236.124.17 with SMTP id w17mr28007377yhh.126.1319568876490;
+        Tue, 25 Oct 2011 11:54:36 -0700 (PDT)
+Return-Path: <linux-kernel-owner at vger.kernel.org>
+Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
+        by mx.google.com with ESMTP id d47si24837679yhn.69.2011.10.25.11.54.34;
+        Tue, 25 Oct 2011 11:54:36 -0700 (PDT)
+Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner at vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
+Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner at vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner at vger.kernel.org
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+	id S1750837Ab1JYSyG (ORCPT <rfc822;abhay.linux at gmail.com>
+	+ 99 others); Tue, 25 Oct 2011 14:54:06 -0400
+Received: from mx1.redhat.com ([209.132.183.28]:17177 "EHLO mx1.redhat.com"
+	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
+	id S1750755Ab1JYSyF (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
+	Tue, 25 Oct 2011 14:54:05 -0400
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9PIs3QL004267
+	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
+	Tue, 25 Oct 2011 14:54:03 -0400
+Received: from gelk.kernelslacker.org (ovpn-113-62.phx2.redhat.com [10.3.113.62])
+	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9PIs2CE024426
+	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
+	Tue, 25 Oct 2011 14:54:03 -0400
+Received: from gelk.kernelslacker.org (gelk [127.0.0.1])
+	by gelk.kernelslacker.org (8.14.5/8.14.4) with ESMTP id p9PIs0Ia021463;
+	Tue, 25 Oct 2011 14:54:01 -0400
+Received: (from davej at localhost)
+	by gelk.kernelslacker.org (8.14.5/8.14.5/Submit) id p9PIs0wZ021462;
+	Tue, 25 Oct 2011 14:54:00 -0400
+X-Authentication-Warning: gelk.kernelslacker.org: davej set sender to davej at redhat.com using -f
+Date:	Tue, 25 Oct 2011 14:54:00 -0400
+From:	Dave Jones <davej at redhat.com>
+To:	Mark Brown <broonie at opensource.wolfsonmicro.com>
+Cc:	Linux Kernel <linux-kernel at vger.kernel.org>
+Subject: wm8400-core: select REGMAP_I2C in kconfig
+Message-ID: <20111025185359.GA21019 at redhat.com>
+Mail-Followup-To: Dave Jones <davej at redhat.com>,
+	Mark Brown <broonie at opensource.wolfsonmicro.com>,
+	Linux Kernel <linux-kernel at vger.kernel.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.5.21 (2010-09-15)
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
+Sender:	linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List:	linux-kernel at vger.kernel.org
+
+wm8400-core.c is using the regmap I2C API, so needs to select it.
+
+ERROR: "regmap_write" [drivers/mfd/wm8400-core.ko] undefined!
+ERROR: "regmap_raw_read" [drivers/mfd/wm8400-core.ko] undefined!
+ERROR: "regmap_read" [drivers/mfd/wm8400-core.ko] undefined!
+ERROR: "regmap_init_i2c" [drivers/mfd/wm8400-core.ko] undefined!
+ERROR: "regmap_bulk_read" [drivers/mfd/wm8400-core.ko] undefined!
+ERROR: "regmap_exit" [drivers/mfd/wm8400-core.ko] undefined!
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
+index a67adcb..67a6126 100644
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -389,6 +389,7 @@ config MFD_MAX8998
+ config MFD_WM8400
+ 	tristate "Support Wolfson Microelectronics WM8400"
+ 	select MFD_CORE
++	select REGMAP_I2C
+ 	depends on I2C
+ 	help
+ 	  Support for the Wolfson Microelecronics WM8400 PMIC and audio
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at 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/sources b/sources
index 9529d7a..92fae4e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
+cdc32e1639137a0434181946bc4d502c  patch-3.1-git1.bz2
diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch
index 052a27e..3835050 100644
--- a/usb-add-quirk-for-logitech-webcams.patch
+++ b/usb-add-quirk-for-logitech-webcams.patch
@@ -1,74 +1,30 @@
-From d5446509abd85b6845d91a319a033c5bd17e494d Mon Sep 17 00:00:00 2001
-From: Oliver Neukum <oneukum-l3A5Bk7waGM at public.gmane.org>
-Date: Tue, 13 Sep 2011 08:42:21 +0200
-Subject: [PATCH] USB:add RESET_RESUME for webcams shown to be quirky
+From 47a9e4d129eb621737f2d7147ce1db0da473a98f Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer at redhat.com>
+Date: Wed, 26 Oct 2011 13:47:56 -0400
+Subject: [PATCH] USB: add quirk for Logitech C600 web cam
 
-From 6f673c5ef819548b2cbaf7bb607779af6fdbe731 Mon Sep 17 00:00:00 2001
-From: Oliver Neukum <oliver-GvhC2dPhHPQdnm+yROfE0A at public.gmane.org>
-Date: Tue, 30 Aug 2011 15:34:32 +0200
-Subject: [PATCH] USB:add RESET_RESUME for webcams shown to be quirky
+We've had another report of the "chipmunk" sound on a Logitech C600 webcam.
+This patch resolves the issue.
 
-The new runtime PM code has shown that many webcams suffer
-from a race condition that may crash them upon resume.
-Runtime PM is especially prone to show the problem because
-it retains power to the cameras at all times. However
-system suspension may also crash the devices and retain
-power to the devices.
-The only way to solve this problem without races is in
-usbcore with the RESET_RESUME quirk.
-
-Signed-off-by: Oliver Neukum <oneukum-l3A5Bk7waGM at public.gmane.org>
-
-Add C300 ID from patch in rhbz #742010
-Add C600 ID from rhbz #742010
+Cc: stable <stable at vger.kernel.org>
+Signed-off-by: Josh Boyer <jwboyer at redhat.com>
 ---
- drivers/usb/core/quirks.c |   27 +++++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
+ drivers/usb/core/quirks.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 81ce6a8..caa1991 100644
+index d6a8d82..caa1991 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
-@@ -38,6 +38,30 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Creative SB Audigy 2 NX */
- 	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
+@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+ 	/* Logitech Webcam B/C500 */
+ 	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
  
-+	/* Logitech Webcam C200 */
-+	{ USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C250 */
-+	{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C300 */
-+	{ USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam B/C500 */
-+	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
-+
 +	/* Logitech Webcam C600 */
 +	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
 +
-+	/* Logitech Webcam Pro 9000 */
-+	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C310 */
-+	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C270 */
-+	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Harmony 700-series */
- 	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
- 
-@@ -69,6 +93,9 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
- 			USB_QUIRK_CONFIG_INTF_STRINGS },
- 
-+	/* Guillemot Webcam Hercules Dualpix Exchange*/
-+	{ USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* M-Systems Flash Disk Pioneers */
- 	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
+ 	/* Logitech Webcam Pro 9000 */
+ 	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
  
 -- 
 1.7.6.4

More information about the scm-commits mailing list