- update 3.3 options/patches

Changed files:
    kernel-imq.patch -> 1.16
    kernel-multiarch.config -> 1.86
    kernel-small_fixes.patch -> 1.56
    kernel-x86.config -> 1.41

diff --git a/kernel-imq.patch b/kernel-imq.patch
index 9f4bf26a71635ae7e777cadd198a9719ce21ec56..785cbfa80540a864202173d685d36dac0fcfa567 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1067,9 +1067,9 @@ diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
 --- linux-3.1/include/linux/skbuff.h   2011-10-24 10:10:05.000000000 +0300
 +++ linux-3.1-imq/include/linux/skbuff.h       2011-11-04 11:12:52.116390515 +0200
 @@ -29,6 +29,9 @@
- #include <linux/dmaengine.h>
  #include <linux/hrtimer.h>
  #include <linux/dma-mapping.h>
+ #include <linux/netdev_features.h>
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +#include <linux/imq.h>
 +#endif
@@ -1292,7 +1292,7 @@ diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
 +              printk(KERN_WARNING
 +                              "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
 +#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+ #if IS_ENABLED(CONFIG_NF_CONNTRACK)
        nf_conntrack_put(skb->nfct);
  #endif
 @@ -533,6 +632,9 @@
@@ -1501,15 +1501,15 @@ diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queu
  
        switch (pf) {
        case NFPROTO_IPV4:
-@@ -244,7 +277,7 @@
-               segs->next = NULL;
-               if (err == 0)
+@@ -299,7 +299,7 @@ int nf_queue(struct sk_buff *skb,
+               if (err == 0) {
+                       nf_bridge_adjust_segmented_data(segs);
                        err = __nf_queue(segs, elem, pf, hook, indev,
 -                                         outdev, okfn, queuenum);
-+                                       outdev, okfn, queuenum, queuetype);
++                                         outdev, okfn, queuenum, queuetype);
+               }
                if (err == 0)
                        queued++;
-               else
 @@ -299,9 +332,11 @@
                local_bh_enable();
                break;

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 19bd0e12239991ac43c5a8b2fff43d90d27e27c8..ec44ffc0c35c5bfd84018a4edcf715011b357ee6 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -6,10 +6,11 @@ AMD_NUMA all=y
 CPU_SUP_AMD all=y
 CPU_SUP_CENTAUR all=y
 CPU_SUP_INTEL all=y
+DEBUG_NMI_SELFTEST all=n
 DEBUG_SET_MODULE_RONX all=y
 DEBUG_STRICT_USER_COPY_CHECKS all=n
 DMI all=y
-EARLY_PRINTK_MRST all=n
+EFI_STUB all=y
 GART_IOMMU all=y
 KEYS_COMPAT all=y
 KVM_MMU_AUDIT all=y
@@ -28,6 +29,7 @@ BLK_DEV_BSG all=y
 BLK_DEV_BSGLIB all=y
 BLK_DEV_INTEGRITY all=y
 BLK_DEV_THROTTLING all=y
+#- file block/partitions/Kconfig goes here
 #- file block/Kconfig.iosched goes here
 
 #-
@@ -42,6 +44,35 @@ DEFAULT_CFQ all=y
 DEFAULT_NOOP all=n
 DEFAULT_IOSCHED all="cfq"
 
+#-
+#- *** FILE: block/partitions/Kconfig ***
+#-
+PARTITION_ADVANCED all=y
+ACORN_PARTITION all=y
+ACORN_PARTITION_CUMANA all=y
+ACORN_PARTITION_EESOX all=y
+ACORN_PARTITION_ICS all=y
+ACORN_PARTITION_ADFS all=y
+ACORN_PARTITION_POWERTEC all=y
+ACORN_PARTITION_RISCIX all=y
+OSF_PARTITION all=y
+AMIGA_PARTITION all=y
+ATARI_PARTITION all=y
+MAC_PARTITION all=y
+MSDOS_PARTITION all=y
+BSD_DISKLABEL all=y
+MINIX_SUBPARTITION all=y
+SOLARIS_X86_PARTITION all=y
+UNIXWARE_DISKLABEL all=y
+LDM_PARTITION all=y
+LDM_DEBUG all=n
+SGI_PARTITION all=y
+ULTRIX_PARTITION all=y
+SUN_PARTITION all=y
+KARMA_PARTITION all=y
+EFI_PARTITION all=y
+SYSV68_PARTITION all=y
+
 #-
 #- *** FILE: crypto/Kconfig ***
 #-
@@ -116,6 +147,7 @@ CRYPTO_SALSA20_586 all=m
 CRYPTO_SALSA20_X86_64 x86_64=m
 CRYPTO_SEED all=m
 CRYPTO_SERPENT all=m
+CRYPTO_SERPENT_SSE2_X86_64 all=m
 CRYPTO_TEA all=m
 CRYPTO_TWOFISH all=m
 CRYPTO_TWOFISH_COMMON all=m
@@ -350,6 +382,7 @@ MAC_FLOPPY ppc=m
 BLK_DEV_XD alpha=m i386=m
 PARIDE all=m
 #- file drivers/block/paride/Kconfig goes here
+#- file drivers/block/mtip32xx/Kconfig goes here
 BLK_CPQ_DA all=m sparc64=n
 BLK_CPQ_CISS_DA all=m sparc=n
 CISS_SCSI_TAPE all=y
@@ -361,6 +394,7 @@ BLK_DEV_LOOP_MIN_COUNT all=8
 BLK_DEV_CRYPTOLOOP all=n
 #- file drivers/block/drbd/Kconfig goes here
 BLK_DEV_NBD all=m
+BLK_DEV_NVME all=m
 BLK_DEV_OSD all=m
 BLK_DEV_SX8 all=m
 BLK_DEV_UB all=n
@@ -387,6 +421,11 @@ BLK_DEV_RBD all=m
 BLK_DEV_DRBD all=m
 DRBD_FAULT_INJECTION all=n
 
+#-
+#- *** FILE: drivers/block/mtip32xx/Kconfig ***
+#-
+BLK_DEV_PCIESSD_MTIP32XX all=m
+
 #-
 #- *** FILE: drivers/block/paride/Kconfig ***
 #-
@@ -682,7 +721,6 @@ DMIID all=y
 DMI_SYSFS all=m
 ISCSI_IBFT_FIND all=y
 ISCSI_IBFT all=m
-SIGMA all=m
 #- file drivers/firmware/google/Kconfig goes here
 
 #-
@@ -710,6 +748,7 @@ GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
 GPIO_SX150X all=m
+GPIO_STMPE all=y
 GPIO_TPS65912 all=m
 GPIO_TWL4030 powerpc=m
 GPIO_WM831X all=m
@@ -750,6 +789,14 @@ DRM_VIA all=m
 DRM_SAVAGE all=m
 #- file drivers/gpu/drm/exynos/Kconfig goes here
 #- file drivers/gpu/drm/vmwgfx/Kconfig goes here
+#- file drivers/gpu/drm/gma500/Kconfig goes here
+
+#-
+#- *** FILE: drivers/gpu/drm/gma500/Kconfig ***
+#-
+DRM_GMA500 all=m
+DRM_GMA600 all=y
+DRM_GMA3600 all=y
 
 #-
 #- *** FILE: drivers/gpu/drm/nouveau/Kconfig ***
@@ -834,10 +881,10 @@ HID_PICOLCD_BACKLIGHT all=y
 HID_PICOLCD_LCD all=y
 HID_PICOLCD_LEDS all=y
 HID_PRIMAX all=m
-HID_QUANTA all=m
 HID_ROCCAT all=m
 HID_ROCCAT_COMMON all=m
 HID_ROCCAT_ARVO all=m
+HID_ROCCAT_ISKU all=m
 HID_ROCCAT_KONE all=m
 HID_ROCCAT_KONEPLUS all=m
 HID_ROCCAT_KOVAPLUS all=m
@@ -848,6 +895,7 @@ HID_SPEEDLINK all=m
 HID_SUNPLUS all=m
 HID_GREENASIA all=m
 GREENASIA_FF all=y
+HID_HYPERV_MOUSE all=m
 HID_SMARTJOYPLUS all=m
 SMARTJOYPLUS_FF all=y
 HID_TOPSEED all=m
@@ -856,6 +904,7 @@ THRUSTMASTER_FF all=y
 HID_WACOM all=m
 HID_WACOM_POWER_SUPPLY all=y
 HID_WIIMOTE all=m
+HID_WIIMOTE_EXT all=y
 HID_ZEROPLUS all=m
 ZEROPLUS_FF all=y
 HID_ZYDACRON all=m
@@ -1201,6 +1250,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/hw/nes/Kconfig goes here
 #- file drivers/infiniband/ulp/ipoib/Kconfig goes here
 #- file drivers/infiniband/ulp/srp/Kconfig goes here
+#- file drivers/infiniband/ulp/srpt/Kconfig goes here
 #- file drivers/infiniband/ulp/iser/Kconfig goes here
 
 #-
@@ -1264,6 +1314,11 @@ INFINIBAND_ISER all=m sparc=
 #-
 INFINIBAND_SRP all=m sparc=
 
+#-
+#- *** FILE: drivers/infiniband/ulp/srpt/Kconfig ***
+#-
+INFINIBAND_SRPT all=m
+
 #-
 #- *** FILE: drivers/input/Kconfig ***
 #-
@@ -1351,6 +1406,7 @@ KEYBOARD_LKKBD all=m
 KEYBOARD_GPIO all=m
 KEYBOARD_GPIO_POLLED all=m
 KEYBOARD_TCA6416 all=m
+KEYBOARD_TCA8418 all=m
 KEYBOARD_MATRIX all=m
 KEYBOARD_LM8323 all=m
 KEYBOARD_MAX7359 all=m
@@ -1360,6 +1416,7 @@ KEYBOARD_NEWTON all=m
 KEYBOARD_OPENCORES all=m
 KEYBOARD_STOWAWAY all=m
 KEYBOARD_SUNKBD all=m sparc=y sparc64=y
+KEYBOARD_STMPE all=m
 KEYBOARD_TWL4030 powerpc=m
 KEYBOARD_XTKBD all=m
 
@@ -1378,6 +1435,8 @@ INPUT_MC13783_PWRBUTTON all=m
 INPUT_MMA8450 all=m
 INPUT_MPU3050 all=m
 INPUT_APANEL all=m
+INPUT_GP2A all=m
+INPUT_GPIO_TILT_POLLED all=m
 INPUT_WISTRON_BTNS i386=m
 INPUT_ATLAS_BTNS i386=m x86_64=m
 INPUT_ATI_REMOTE2 all=m sparc=n
@@ -1461,12 +1520,14 @@ TOUCHSCREEN_AD7879 all=m
 TOUCHSCREEN_AD7879_I2C all=m
 TOUCHSCREEN_AD7879_SPI all=m
 TOUCHSCREEN_ATMEL_MXT all=m
+TOUCHSCREEN_AUO_PIXCIR all=m
 TOUCHSCREEN_BU21013 all=m
 TOUCHSCREEN_CY8CTMG110 all=m
 TOUCHSCREEN_DA9034 all=m
 TOUCHSCREEN_DYNAPRO all=m
 TOUCHSCREEN_HAMPSHIRE all=m
 TOUCHSCREEN_EETI all=m
+TOUCHSCREEN_EGALAX all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GUNZE all=m
 TOUCHSCREEN_ELO all=m
@@ -1482,6 +1543,7 @@ TOUCHSCREEN_PENMOUNT all=m
 TOUCHSCREEN_TOUCHRIGHT all=m
 TOUCHSCREEN_TOUCHWIN all=m
 TOUCHSCREEN_UCB1400 all=m sparc=n
+TOUCHSCREEN_PIXCIR all=m
 TOUCHSCREEN_WM831X all=m
 TOUCHSCREEN_WM97XX all=m
 TOUCHSCREEN_WM9705 all=y
@@ -1512,12 +1574,14 @@ TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
 TOUCHSCREEN_PCAP all=m
 TOUCHSCREEN_ST1232 all=m
+TOUCHSCREEN_STMPE all=m
 TOUCHSCREEN_TPS6507X all=m
 
 #-
 #- *** FILE: drivers/iommu/Kconfig ***
 #-
 IOMMU_SUPPORT all=y
+AMD_IOMMU_V2 all=m
 INTEL_IOMMU all=y
 INTEL_IOMMU_DEFAULT_ON all=y
 IRQ_REMAP all=y
@@ -1684,6 +1748,8 @@ LEDS_INTEL_SS4200 all=m
 LEDS_LT3593 all=m
 LEDS_DELL_NETBOOKS all=m
 LEDS_MC13783 all=m
+LEDS_TCA6507 all=m
+LEDS_OT200 all=m
 LEDS_TRIGGERS all=y
 #- LED Triggers
 LEDS_TRIGGER_TIMER all=m
@@ -2013,12 +2079,24 @@ DVB_TTUSB_DEC all=m
 #- *** FILE: drivers/media/radio/Kconfig ***
 #-
 RADIO_ADAPTERS all=y
+RADIO_SI470X all=y
+#- file drivers/media/radio/si470x/Kconfig goes here
+USB_MR800 all=m
+USB_DSBR all=m
+RADIO_MAXIRADIO all=m
+I2C_SI4713 all=m
+RADIO_SI4713 all=m
+RADIO_TEA5764 all=m
+RADIO_SAA7706H all=m
+RADIO_TEF6862 all=m
+RADIO_TIMBERDALE all=m
+RADIO_WL1273 all=m
+#- file drivers/media/radio/wl128x/Kconfig goes here
 RADIO_CADET alpha=m i386=m
 RADIO_RTRACK alpha=m i386=m
 RADIO_RTRACK2 alpha=m i386=m
 RADIO_AZTECH alpha=m i386=m
 RADIO_GEMTEK alpha=m i386=m
-RADIO_MAXIRADIO all=m
 RADIO_MIROPCM20 all=m
 RADIO_SF16FMI alpha=m i386=m
 RADIO_SF16FMR2 alpha=m i386=m
@@ -2026,18 +2104,6 @@ RADIO_TERRATEC alpha=m i386=m
 RADIO_TRUST alpha=m i386=m
 RADIO_TYPHOON alpha=m i386=m
 RADIO_ZOLTRIX alpha=m i386=m
-I2C_SI4713 all=m
-RADIO_SI4713 all=m
-USB_DSBR all=m
-RADIO_SI470X all=y
-#- file drivers/media/radio/si470x/Kconfig goes here
-USB_MR800 all=m
-RADIO_TEA5764 all=m
-RADIO_SAA7706H all=m
-RADIO_TEF6862 all=m
-RADIO_TIMBERDALE all=m
-RADIO_WL1273 all=m
-#- file drivers/media/radio/wl128x/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/radio/si470x/Kconfig ***
@@ -2061,6 +2127,7 @@ IR_RC6_DECODER all=m
 IR_JVC_DECODER all=m
 IR_SONY_DECODER all=m
 IR_RC5_SZ_DECODER all=m
+IR_SANYO_DECODER all=m
 IR_MCE_KBD_DECODER all=m
 IR_LIRC_CODEC all=m
 RC_ATI_REMOTE all=m
@@ -2135,30 +2202,49 @@ VIDEO_UPD64031A all=m
 VIDEO_UPD64083 all=m
 #- Miscelaneous helper chips
 VIDEO_VIVI all=m
-#- file drivers/media/video/davinci/Kconfig goes here
-#- file drivers/media/video/omap/Kconfig goes here
-#- file drivers/media/video/bt8xx/Kconfig goes here
-VIDEO_PMS all=m
-VIDEO_BWQCAM all=m
-VIDEO_CQCAM all=m
-VIDEO_W9966 all=m
+V4L_USB_DRIVERS all=y sparc=n
+#- file drivers/media/video/uvc/Kconfig goes here
+#- file drivers/media/video/gspca/Kconfig goes here
+#- file drivers/media/video/pvrusb2/Kconfig goes here
+#- file drivers/media/video/hdpvr/Kconfig goes here
+#- file drivers/media/video/em28xx/Kconfig goes here
+#- file drivers/media/video/tlg2300/Kconfig goes here
+#- file drivers/media/video/cx231xx/Kconfig goes here
+#- file drivers/media/video/tm6000/Kconfig goes here
+#- file drivers/media/video/usbvision/Kconfig goes here
+#- file drivers/media/video/et61x251/Kconfig goes here
+#- file drivers/media/video/sn9c102/Kconfig goes here
+#- file drivers/media/video/pwc/Kconfig goes here
 #- file drivers/media/video/cpia2/Kconfig goes here
-#- file drivers/media/video/zoran/Kconfig goes here
-VIDEO_MEYE i386=m x86_64=m
-#- file drivers/media/video/saa7134/Kconfig goes here
-VIDEO_MXB all=m sparc=n
-VIDEO_HEXIUM_ORION all=m
-VIDEO_HEXIUM_GEMINI all=m
-VIDEO_TIMBERDALE all=m
-#- file drivers/media/video/cx88/Kconfig goes here
+USB_ZR364XX all=m
+USB_STKWEBCAM all=m
+USB_S2255 all=m
+V4L_PCI_DRIVERS all=y
+#- file drivers/media/video/au0828/Kconfig goes here
+#- file drivers/media/video/bt8xx/Kconfig goes here
+#- file drivers/media/video/cx18/Kconfig goes here
 #- file drivers/media/video/cx23885/Kconfig goes here
 #- file drivers/media/video/cx25821/Kconfig goes here
-#- file drivers/media/video/au0828/Kconfig goes here
+#- file drivers/media/video/cx88/Kconfig goes here
+VIDEO_HEXIUM_GEMINI all=m
+VIDEO_HEXIUM_ORION all=m
 #- file drivers/media/video/ivtv/Kconfig goes here
-#- file drivers/media/video/cx18/Kconfig goes here
+VIDEO_MEYE i386=m x86_64=m
+VIDEO_MXB all=m sparc=n
+#- file drivers/media/video/saa7134/Kconfig goes here
 #- file drivers/media/video/saa7164/Kconfig goes here
+#- file drivers/media/video/zoran/Kconfig goes here
+V4L_ISA_PARPORT_DRIVERS all=y
+VIDEO_BWQCAM all=m
+VIDEO_CQCAM all=m
+VIDEO_PMS all=m
+VIDEO_W9966 all=m
+V4L_PLATFORM_DRIVERS all=y
 #- file drivers/media/video/marvell-ccic/Kconfig goes here
 VIDEO_VIA_CAMERA all=m
+#- file drivers/media/video/davinci/Kconfig goes here
+#- file drivers/media/video/omap/Kconfig goes here
+VIDEO_TIMBERDALE all=m
 SOC_CAMERA all=m
 SOC_CAMERA_IMX074 all=m
 SOC_CAMERA_MT9M001 all=m
@@ -2177,22 +2263,6 @@ SOC_CAMERA_OV9640 all=m
 SOC_CAMERA_OV9740 all=m
 VIDEO_SH_MOBILE_CEU all=m
 #- file drivers/media/video/s5p-tv/Kconfig goes here
-V4L_USB_DRIVERS all=y sparc=n
-#- file drivers/media/video/uvc/Kconfig goes here
-#- file drivers/media/video/gspca/Kconfig goes here
-#- file drivers/media/video/pvrusb2/Kconfig goes here
-#- file drivers/media/video/hdpvr/Kconfig goes here
-#- file drivers/media/video/em28xx/Kconfig goes here
-#- file drivers/media/video/tlg2300/Kconfig goes here
-#- file drivers/media/video/cx231xx/Kconfig goes here
-#- file drivers/media/video/tm6000/Kconfig goes here
-#- file drivers/media/video/usbvision/Kconfig goes here
-#- file drivers/media/video/et61x251/Kconfig goes here
-#- file drivers/media/video/sn9c102/Kconfig goes here
-#- file drivers/media/video/pwc/Kconfig goes here
-USB_ZR364XX all=m
-USB_STKWEBCAM all=m
-USB_S2255 all=m
 V4L_MEM2MEM_DRIVERS all=y
 VIDEO_MEM2MEM_TESTDEV all=m
 
@@ -2278,6 +2348,7 @@ USB_GSPCA_CPIA1 all=m
 USB_GSPCA_ETOMS all=m
 USB_GSPCA_FINEPIX all=m
 USB_GSPCA_JEILINJ all=m
+USB_GSPCA_JL2005BCD all=m
 USB_GSPCA_KINECT all=m
 USB_GSPCA_KONICA all=m
 USB_GSPCA_MARS all=m
@@ -2481,7 +2552,10 @@ TPS6507X all=m
 MFD_TPS6586X all=m
 MFD_TPS65912_SPI all=y
 TWL4030_CORE powerpc=y
+MFD_STMPE all=y
+STMPE_SPI all=y
 PMIC_DA903X powerpc=y
+MFD_DA9052_SPI all=y
 MFD_WM8400 all=m
 MFD_WM831X all=y
 MFD_WM831X_SPI all=y
@@ -2511,7 +2585,6 @@ MFD_WL1273_CORE all=m
 #- *** FILE: drivers/misc/Kconfig ***
 #-
 SENSORS_LIS3LV02D all=m
-MISC_DEVICES all=y
 AD525X_DPOT all=m
 AD525X_DPOT_I2C all=m
 AD525X_DPOT_SPI all=m
@@ -2824,6 +2897,7 @@ NET_FC all=y
 MII all=m
 #- file drivers/ieee802154/Kconfig goes here
 IFB all=m
+#- file drivers/net/team/Kconfig goes here
 MACVLAN all=m
 MACVTAP all=m
 NETCONSOLE all=m
@@ -2838,6 +2912,7 @@ VIRTIO_NET all=m
 #- file drivers/net/arcnet/Kconfig goes here
 #- file drivers/atm/Kconfig goes here
 #- file drivers/net/caif/Kconfig goes here
+#- file drivers/net/dsa/Kconfig goes here
 #- file drivers/net/ethernet/Kconfig goes here
 #- file drivers/net/fddi/Kconfig goes here
 #- file drivers/net/hippi/Kconfig goes here
@@ -2855,6 +2930,7 @@ NET_SB1000 all=m
 XEN_NETDEV_FRONTEND all=m
 XEN_NETDEV_BACKEND all=m
 VMXNET3 all=m
+#- file drivers/net/hyperv/Kconfig goes here
 
 #-
 #- *** FILE: drivers/net/appletalk/Kconfig ***
@@ -2907,6 +2983,7 @@ PCH_CAN all=m
 #- file drivers/net/can/mscan/Kconfig goes here
 #- file drivers/net/can/sja1000/Kconfig goes here
 #- file drivers/net/can/c_can/Kconfig goes here
+#- file drivers/net/can/cc770/Kconfig goes here
 #- file drivers/net/can/usb/Kconfig goes here
 #- file drivers/net/can/softing/Kconfig goes here
 CAN_DEBUG_DEVICES all=n
@@ -2917,6 +2994,13 @@ CAN_DEBUG_DEVICES all=n
 CAN_C_CAN all=m
 CAN_C_CAN_PLATFORM all=m
 
+#-
+#- *** FILE: drivers/net/can/cc770/Kconfig ***
+#-
+CAN_CC770 all=m
+CAN_CC770_ISA all=m
+CAN_CC770_PLATFORM all=m
+
 #-
 #- *** FILE: drivers/net/can/sja1000/Kconfig ***
 #-
@@ -2943,6 +3027,13 @@ CAN_SOFTING_CS all=m
 CAN_EMS_USB all=m
 CAN_ESD_USB2 all=m
 
+#-
+#- *** FILE: drivers/net/dsa/Kconfig ***
+#-
+NET_DSA_MV88E6060 all=y
+NET_DSA_MV88E6131 all=y
+NET_DSA_MV88E6123_61_65 all=y
+
 #-
 #- *** FILE: drivers/net/ethernet/3com/Kconfig ***
 #-
@@ -2991,6 +3082,7 @@ WD80x3 alpha=m i386=m
 #- file drivers/net/ethernet/adi/Kconfig goes here
 #- file drivers/net/ethernet/broadcom/Kconfig goes here
 #- file drivers/net/ethernet/brocade/Kconfig goes here
+#- file drivers/net/ethernet/calxeda/Kconfig goes here
 #- file drivers/net/ethernet/chelsio/Kconfig goes here
 #- file drivers/net/ethernet/cirrus/Kconfig goes here
 #- file drivers/net/ethernet/cisco/Kconfig goes here
@@ -3108,6 +3200,11 @@ NET_VENDOR_BROCADE all=y
 #-
 BNA all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/calxeda/Kconfig ***
+#-
+NET_CALXEDA_XGMAC all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/chelsio/Kconfig ***
 #-
@@ -3406,6 +3503,8 @@ NET_VENDOR_STMICRO all=y
 #- *** FILE: drivers/net/ethernet/stmicro/stmmac/Kconfig ***
 #-
 STMMAC_ETH all=m
+STMMAC_PLATFORM all=m
+STMMAC_PCI all=m
 STMMAC_DEBUG_FS all=y
 STMMAC_DA all=y
 STMMAC_RING all=y
@@ -3492,6 +3591,11 @@ HIPPI all=y
 ROADRUNNER all=m
 ROADRUNNER_LARGE_RINGS all=n
 
+#-
+#- *** FILE: drivers/net/hyperv/Kconfig ***
+#-
+HYPERV_NET all=m
+
 #-
 #- *** FILE: drivers/net/irda/Kconfig ***
 #-
@@ -3547,6 +3651,7 @@ MICREL_PHY all=m
 FIXED_PHY all=y
 MDIO_BITBANG all=m
 MDIO_GPIO all=m
+MICREL_KS8995MA all=m
 
 #-
 #- *** FILE: drivers/net/plip/Kconfig ***
@@ -3578,6 +3683,13 @@ SLIP_COMPRESSED all=y
 SLIP_SMART all=y
 SLIP_MODE_SLIP6 all=y
 
+#-
+#- *** FILE: drivers/net/team/Kconfig ***
+#-
+NET_TEAM all=m
+NET_TEAM_MODE_ROUNDROBIN all=m
+NET_TEAM_MODE_ACTIVEBACKUP all=m
+
 #-
 #- *** FILE: drivers/net/tokenring/Kconfig ***
 #-
@@ -3755,6 +3867,7 @@ ATH9K_PCI all=y
 ATH9K_AHB all=y
 ATH9K_DEBUGFS all=n
 ATH9K_RATE_CONTROL all=y
+ATH9K_BTCOEX_SUPPORT all=y
 ATH9K_HTC all=m
 ATH9K_HTC_DEBUGFS all=y
 
@@ -3821,9 +3934,7 @@ LIBIPW_DEBUG all=n
 #-
 #- *** FILE: drivers/net/wireless/iwlegacy/Kconfig ***
 #-
-IWLWIFI_LEGACY all=m
-IWLWIFI_LEGACY_DEBUG all=n
-IWLWIFI_LEGACY_DEVICE_TRACING all=n
+IWLEGACY_DEBUG all=n
 IWL4965 all=m
 IWL3945 all=m
 
@@ -3834,7 +3945,7 @@ IWLWIFI all=m
 IWLWIFI_DEBUG all=y
 IWLWIFI_DEBUG_EXPERIMENTAL_UCODE all=y
 IWLWIFI_DEVICE_TRACING all=n
-IWLWIFI_DEVICE_SVTOOL all=y
+IWLWIFI_P2P all=y
 
 #-
 #- *** FILE: drivers/net/wireless/iwmc3200wifi/Kconfig ***
@@ -3934,7 +4045,6 @@ WL12XX_MENU all=m
 WL12XX all=m
 WL12XX_SPI all=m
 WL12XX_SDIO all=m
-WL12XX_SDIO_TEST all=m
 
 #-
 #- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
@@ -3985,6 +4095,7 @@ HT_IRQ i386=y x86_64=y
 PCI_IOV all=y
 PCI_PRI all=y
 PCI_PASID all=y
+PCI_IOAPIC all=m
 PCI_LABEL all=y
 
 #-
@@ -4060,6 +4171,8 @@ DELL_WMI all=m
 DELL_WMI_AIO all=m
 FUJITSU_LAPTOP all=m
 FUJITSU_LAPTOP_DEBUG all=n
+FUJITSU_TABLET all=m
+AMILO_RFKILL all=m
 TC1100_WMI all=m
 HP_ACCEL all=m
 HP_WMI all=m
@@ -4142,7 +4255,7 @@ BATTERY_DS2760 all=m
 BATTERY_DS2780 all=m
 BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
-BATTERY_BQ20Z75 all=m
+BATTERY_SBS all=m
 BATTERY_BQ27x00 all=m
 BATTERY_BQ27X00_I2C all=y
 BATTERY_BQ27X00_PLATFORM all=y
@@ -4153,7 +4266,9 @@ CHARGER_PCF50633 all=m
 BATTERY_INTEL_MID all=m
 CHARGER_ISP1704 all=m
 CHARGER_MAX8903 all=m
+CHARGER_LP8727 all=m
 CHARGER_GPIO all=m
+CHARGER_MANAGER all=y
 
 #-
 #- *** FILE: drivers/pps/Kconfig ***
@@ -4223,6 +4338,7 @@ REGULATOR_WM8350 all=m
 REGULATOR_WM8400 all=m
 REGULATOR_WM8994 all=m
 REGULATOR_DA903X all=m
+REGULATOR_DA9052 all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_LP3971 all=m
 REGULATOR_LP3972 all=m
@@ -4648,13 +4764,11 @@ STAGING all=y
 #- file drivers/staging/rts_pstor/Kconfig goes here
 #- file drivers/staging/rts5139/Kconfig goes here
 #- file drivers/staging/frontier/Kconfig goes here
-#- file drivers/staging/pohmelfs/Kconfig goes here
 #- file drivers/staging/phison/Kconfig goes here
 #- file drivers/staging/line6/Kconfig goes here
 #- file drivers/gpu/drm/nouveau/Kconfig goes here
 #- file drivers/staging/octeon/Kconfig goes here
 #- file drivers/staging/serqt_usb2/Kconfig goes here
-#- file drivers/staging/spectra/Kconfig goes here
 #- file drivers/staging/quatech_usb2/Kconfig goes here
 #- file drivers/staging/vt6655/Kconfig goes here
 #- file drivers/staging/vt6656/Kconfig goes here
@@ -4676,14 +4790,20 @@ STAGING all=y
 #- file drivers/staging/keucr/Kconfig goes here
 #- file drivers/staging/bcm/Kconfig goes here
 #- file drivers/staging/ft1000/Kconfig goes here
-#- file drivers/staging/intel_sst/Kconfig goes here
 #- file drivers/staging/speakup/Kconfig goes here
 #- file drivers/staging/cptm1217/Kconfig goes here
 #- file drivers/staging/ste_rmi4/Kconfig goes here
-#- file drivers/staging/gma500/Kconfig goes here
 #- file drivers/staging/mei/Kconfig goes here
 #- file drivers/staging/nvec/Kconfig goes here
 #- file drivers/staging/media/Kconfig goes here
+#- file drivers/staging/omapdrm/Kconfig goes here
+#- file drivers/staging/android/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/android/Kconfig ***
+#-
+ANDROID all=n
+#- file drivers/staging/android/switch/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/asus_oled/Kconfig ***
@@ -4863,20 +4983,10 @@ FT1000 all=m
 FT1000_USB all=m
 FT1000_PCMCIA all=m
 
-#-
-#- *** FILE: drivers/staging/gma500/Kconfig ***
-#-
-DRM_PSB all=m
-DRM_PSB_MRST all=y
-DRM_PSB_MFLD all=y
-DRM_PSB_CDV all=y
-
 #-
 #- *** FILE: drivers/staging/hv/Kconfig ***
 #-
 HYPERV_STORAGE all=m
-HYPERV_NET all=m
-HYPERV_MOUSE all=m
 
 #-
 #- *** FILE: drivers/staging/iio/Kconfig ***
@@ -4959,9 +5069,12 @@ AD7746 all=m
 #-
 AD5064 all=m
 AD5360 all=m
+AD5380 all=m
+AD5421 all=m
 AD5624R_SPI all=m
 AD5446 all=m
 AD5504 all=m
+AD5764 all=m
 AD5791 all=m
 AD5686 all=m
 MAX517 all=m
@@ -5035,12 +5148,6 @@ IIO_PERIODIC_RTC_TRIGGER all=m
 IIO_GPIO_TRIGGER all=m
 IIO_SYSFS_TRIGGER all=m
 
-#-
-#- *** FILE: drivers/staging/intel_sst/Kconfig ***
-#-
-SND_INTEL_SST all=m
-SND_INTELMID all=n
-
 #-
 #- *** FILE: drivers/staging/keucr/Kconfig ***
 #-
@@ -5144,12 +5251,6 @@ PANEL_CHANGE_MESSAGE all=n
 #-
 IDE_PHISON all=m
 
-#-
-#- *** FILE: drivers/staging/pohmelfs/Kconfig ***
-#-
-POHMELFS all=m
-POHMELFS_DEBUG all=n
-
 #-
 #- *** FILE: drivers/staging/quatech_usb2/Kconfig ***
 #-
@@ -5168,6 +5269,15 @@ R8187SE all=m
 #-
 #- *** FILE: drivers/staging/rtl8192e/Kconfig ***
 #-
+RTLLIB all=m
+RTLLIB_CRYPTO_CCMP all=m
+RTLLIB_CRYPTO_TKIP all=m
+RTLLIB_CRYPTO_WEP all=m
+#- file drivers/staging/rtl8192e/rtl8192e/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/rtl8192e/rtl8192e/Kconfig ***
+#-
 RTL8192E all=m
 
 #-
@@ -5238,14 +5348,6 @@ SPEAKUP_SYNTH_SPKOUT all=m
 SPEAKUP_SYNTH_TXPRT all=m
 SPEAKUP_SYNTH_DUMMY all=m
 
-#-
-#- *** FILE: drivers/staging/spectra/Kconfig ***
-#-
-SPECTRA all=m
-SPECTRA_MRST_HW all=n
-SPECTRA_MTD all=y
-SPECTRA_EMU all=n
-
 #-
 #- *** FILE: drivers/staging/ste_rmi4/Kconfig ***
 #-
@@ -5285,6 +5387,7 @@ VME_TSI148 all=m
 #-
 #- VME Device Drivers
 VME_USER all=m
+VME_PIO2 all=m
 
 #-
 #- *** FILE: drivers/staging/vt6655/Kconfig ***
@@ -5412,7 +5515,7 @@ HVC_UDBG all=n
 HVCS ppc64=n
 
 #-
-#- *** FILE: drivers/tty/serial/Kconfig ***
+#- *** FILE: drivers/tty/serial/8250/Kconfig ***
 #-
 SERIAL_8250 all=y
 SERIAL_8250_CONSOLE all=y
@@ -5432,10 +5535,14 @@ SERIAL_8250_SHARE_IRQ all=y
 SERIAL_8250_DETECT_IRQ all=y
 SERIAL_8250_RSA all=y
 SERIAL_8250_MCA i386=m
+
+#-
+#- *** FILE: drivers/tty/serial/Kconfig ***
+#-
+#- file drivers/tty/serial/8250/Kconfig goes here
 #- Non-8250 serial port support
 SERIAL_MAX3100 all=m
 SERIAL_MAX3107 all=m
-SERIAL_MAX3107_AAVA all=m
 SERIAL_MRST_MAX3110 all=m
 SERIAL_MFD_HSU all=m
 SERIAL_UARTLITE all=m
@@ -5558,7 +5665,8 @@ USB_GADGET_DEBUG_FS all=n
 USB_GADGET_VBUS_DRAW all=2
 USB_GADGET_STORAGE_NUM_BUFFERS all=2
 USB_R8A66597 all=m
-USB_GADGET_DWC3 all=m
+USB_RENESAS_USBHS_UDC all=m
+USB_MV_UDC all=m
 USB_GADGET_MUSB_HDRC all=n
 USB_M66592 all=m
 USB_AMD5536UDC all=m
@@ -5613,6 +5721,7 @@ USB_EHCI_TT_NEWSCHED all=y
 USB_EHCI_BIG_ENDIAN_MMIO all=n ppc64=y
 USB_EHCI_FSL ppc=y
 USB_EHCI_HCD_PPC_OF ppc=y ppc64=y
+USB_EHCI_MV all=y
 USB_OXU210HP_HCD all=m
 USB_ISP116X_HCD all=m
 USB_ISP1760_HCD all=m
@@ -5692,8 +5801,8 @@ USB_MUSB_HDRC all=n
 USB_GPIO_VBUS all=m
 TWL4030_USB all=m
 NOP_USB_XCEIV all=m
-USB_LANGWELL_OTG all=m
 AB8500_USB all=m
+USB_MV_OTG all=m
 
 #-
 #- *** FILE: drivers/usb/renesas_usbhs/Kconfig ***
@@ -5818,6 +5927,7 @@ VHOST_NET all=m
 #- file drivers/char/agp/Kconfig goes here
 #- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
+#- file drivers/gpu/misc/Kconfig goes here
 #- file drivers/gpu/stub/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
@@ -5944,7 +6054,6 @@ FB_BROADSHEET all=m
 #- file drivers/video/omap/Kconfig goes here
 #- file drivers/video/omap2/Kconfig goes here
 #- file drivers/video/backlight/Kconfig goes here
-#- file drivers/video/display/Kconfig goes here
 #- file drivers/video/console/Kconfig goes here
 #- file drivers/video/logo/Kconfig goes here
 
@@ -5997,12 +6106,6 @@ FONT_SUN8x16 ppc=n ppc64=n sparc=y sparc64=y
 FONT_SUN12x22 ppc=n ppc64=n sparc=y sparc64=y
 FONT_10x18 all=n
 
-#-
-#- *** FILE: drivers/video/display/Kconfig ***
-#-
-DISPLAY_SUPPORT all=m
-#- Display hardware drivers
-
 #-
 #- *** FILE: drivers/video/geode/Kconfig ***
 #-
@@ -6107,6 +6210,7 @@ SBC7240_WDT all=m
 CPU5_WDT i386=m x86_64=m
 SMSC_SCH311X_WDT all=m
 SMSC37B787_WDT i386=m x86_64=m
+VIA_WDT all=m
 W83627HF_WDT i386=m x86_64=m
 W83697HF_WDT i386=m x86_64=m
 W83697UG_WDT i386=m x86_64=m
@@ -6217,6 +6321,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
 #- file fs/aufs/Kconfig goes here
+#- file fs/exofs/Kconfig.ore goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -6231,7 +6336,6 @@ NFS_COMMON all=y
 #- file fs/coda/Kconfig goes here
 #- file fs/afs/Kconfig goes here
 #- file fs/9p/Kconfig goes here
-#- file fs/partitions/Kconfig goes here
 #- file fs/nls/Kconfig goes here
 #- file fs/dlm/Kconfig goes here
 
@@ -6289,6 +6393,7 @@ BFS_FS all=m
 #-
 BTRFS_FS all=m
 BTRFS_FS_POSIX_ACL all=y
+BTRFS_FS_CHECK_INTEGRITY all=n
 
 #-
 #- *** FILE: fs/cachefiles/Kconfig ***
@@ -6521,6 +6626,7 @@ NFSD_V2_ACL all=y
 NFSD_V3 all=y
 NFSD_V3_ACL all=y
 NFSD_V4 all=y
+NFSD_FAULT_INJECTION all=n
 
 #-
 #- *** FILE: fs/nilfs2/Kconfig ***
@@ -6609,35 +6715,6 @@ OCFS2_DEBUG_FS all=n
 #-
 OMFS_FS all=m
 
-#-
-#- *** FILE: fs/partitions/Kconfig ***
-#-
-PARTITION_ADVANCED all=y
-ACORN_PARTITION all=y
-ACORN_PARTITION_CUMANA all=y
-ACORN_PARTITION_EESOX all=y
-ACORN_PARTITION_ICS all=y
-ACORN_PARTITION_ADFS all=y
-ACORN_PARTITION_POWERTEC all=y
-ACORN_PARTITION_RISCIX all=y
-OSF_PARTITION all=y
-AMIGA_PARTITION all=y
-ATARI_PARTITION all=y
-MAC_PARTITION all=y
-MSDOS_PARTITION all=y
-BSD_DISKLABEL all=y
-MINIX_SUBPARTITION all=y
-SOLARIS_X86_PARTITION all=y
-UNIXWARE_DISKLABEL all=y
-LDM_PARTITION all=y
-LDM_DEBUG all=n
-SGI_PARTITION all=y
-ULTRIX_PARTITION all=y
-SUN_PARTITION all=y
-KARMA_PARTITION all=y
-EFI_PARTITION all=y
-SYSV68_PARTITION all=y
-
 #-
 #- *** FILE: fs/proc/Kconfig ***
 #-
@@ -6766,6 +6843,7 @@ TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 AUDIT all=y
 AUDITSYSCALL all=y
+AUDIT_LOGINUID_IMMUTABLE all=n
 #- file kernel/irq/Kconfig goes here
 TREE_RCU all=y
 RCU_TRACE all=n
@@ -6786,6 +6864,7 @@ RESOURCE_COUNTERS all=y
 CGROUP_MEM_RES_CTLR all=y
 CGROUP_MEM_RES_CTLR_SWAP all=y
 CGROUP_MEM_RES_CTLR_SWAP_ENABLED all=n
+CGROUP_MEM_RES_CTLR_KMEM all=y
 CGROUP_PERF all=y
 CGROUP_SCHED all=y
 FAIR_GROUP_SCHED all=y
@@ -7156,7 +7235,9 @@ BRIDGE_NETFILTER all=y
 #- file net/dcb/Kconfig goes here
 #- file net/dns_resolver/Kconfig goes here
 #- file net/batman-adv/Kconfig goes here
+#- file net/openvswitch/Kconfig goes here
 RFS_ACCEL all=y
+NETPRIO_CGROUP all=m
 HAVE_BPF_JIT all=y
 BPF_JIT all=y
 NET_PKTGEN all=m
@@ -7210,8 +7291,6 @@ BATMAN_ADV_DEBUG all=n
 #- *** FILE: net/bluetooth/Kconfig ***
 #-
 BT all=m
-BT_L2CAP all=y
-BT_SCO all=y
 #- file net/bluetooth/rfcomm/Kconfig goes here
 #- file net/bluetooth/bnep/Kconfig goes here
 #- file net/bluetooth/cmtp/Kconfig goes here
@@ -7279,6 +7358,7 @@ BRIDGE_EBT_NFLOG=m
 CAIF all=m
 CAIF_DEBUG all=n
 CAIF_NETDEV all=m
+CAIF_USB all=m
 
 #-
 #- *** FILE: net/can/Kconfig ***
@@ -7333,9 +7413,6 @@ DECNET_NF_GRABULATOR all=m
 #- *** FILE: net/dsa/Kconfig ***
 #-
 NET_DSA all=y
-NET_DSA_MV88E6060 all=y
-NET_DSA_MV88E6131 all=y
-NET_DSA_MV88E6123_61_65 all=y
 
 #-
 #- *** FILE: net/econet/Kconfig ***
@@ -7385,6 +7462,7 @@ INET_XFRM_MODE_BEET all=m
 INET_LRO all=y
 INET_DIAG all=m
 INET_TCP_DIAG all=m
+INET_UDP_DIAG all=m
 TCP_CONG_ADVANCED all=y
 TCP_CONG_BIC all=m
 TCP_CONG_CUBIC all=y
@@ -7416,6 +7494,7 @@ IP_NF_QUEUE all=m
 IP_NF_IPTABLES all=m
 IP_NF_MATCH_AH all=m
 IP_NF_MATCH_ECN all=m
+IP_NF_MATCH_RPFILTER all=m
 IP_NF_MATCH_TTL all=m
 IP_NF_FILTER all=m
 IP_NF_TARGET_REJECT all=m
@@ -7476,6 +7555,7 @@ IP6_NF_MATCH_OPTS all=m
 IP6_NF_MATCH_HL all=m
 IP6_NF_MATCH_IPV6HEADER all=m
 IP6_NF_MATCH_MH all=m
+IP6_NF_MATCH_RPFILTER all=m
 IP6_NF_MATCH_RT all=m
 IP6_NF_TARGET_HL all=m
 IP6_NF_TARGET_LOG all=m
@@ -7561,12 +7641,14 @@ MAC80211_DEBUG_MENU all=n
 #-
 #- *** FILE: net/netfilter/Kconfig ***
 #-
+NETFILTER_NETLINK_ACCT all=m
 NETFILTER_NETLINK_QUEUE all=m
 NETFILTER_NETLINK_LOG all=m
 NF_CONNTRACK all=m
 NF_CONNTRACK_MARK all=y
 NF_CONNTRACK_SECMARK all=y
 NF_CONNTRACK_ZONES all=y
+NF_CONNTRACK_PROCFS all=n
 NF_CONNTRACK_EVENTS all=y
 NF_CONNTRACK_TIMESTAMP all=y
 NF_CT_PROTO_DCCP=m
@@ -7635,6 +7717,7 @@ NETFILTER_XT_MATCH_LIMIT all=m
 NETFILTER_XT_MATCH_MAC all=m
 NETFILTER_XT_MATCH_MARK all=m
 NETFILTER_XT_MATCH_MULTIPORT all=m
+NETFILTER_XT_MATCH_NFACCT all=m
 NETFILTER_XT_MATCH_OSF all=m
 NETFILTER_XT_MATCH_OWNER all=m
 NETFILTER_XT_MATCH_POLICY all=m
@@ -7697,6 +7780,7 @@ IP_VS_DH all=m
 IP_VS_SH all=m
 IP_VS_SED all=m
 IP_VS_NQ all=m
+IP_VS_SH_TAB_BITS all=8
 IP_VS_FTP all=m
 IP_VS_NFCT all=y
 IP_VS_PE_SIP all=m
@@ -7711,13 +7795,24 @@ NETLABEL all=y
 #-
 NFC all=m
 #- file net/nfc/nci/Kconfig goes here
+#- file net/nfc/llcp/Kconfig goes here
 #- file drivers/nfc/Kconfig goes here
 
+#-
+#- *** FILE: net/nfc/llcp/Kconfig ***
+#-
+NFC_LLCP all=y
+
 #-
 #- *** FILE: net/nfc/nci/Kconfig ***
 #-
 NFC_NCI all=m
 
+#-
+#- *** FILE: net/openvswitch/Kconfig ***
+#-
+OPENVSWITCH all=m
+
 #-
 #- *** FILE: net/packet/Kconfig ***
 #-
@@ -7838,6 +7933,7 @@ TIPC_DEBUG all=n
 #- *** FILE: net/unix/Kconfig ***
 #-
 UNIX all=y
+UNIX_DIAG all=m
 
 #-
 #- *** FILE: net/wanrouter/Kconfig ***
@@ -7918,6 +8014,7 @@ DEFAULT_SECURITY all=""
 #-
 SECURITY_APPARMOR=y
 SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+SECURITY_APPARMOR_COMPAT_24=y
 
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
@@ -8256,7 +8353,6 @@ SND_PS3_DEFAULT_START_DELAY ppc64=2000
 #- *** FILE: sound/soc/Kconfig ***
 #-
 SND_SOC all=m
-SND_SOC_CACHE_LZO all=y
 #- file sound/soc/atmel/Kconfig goes here
 #- file sound/soc/au1x/Kconfig goes here
 #- file sound/soc/blackfin/Kconfig goes here
@@ -8350,17 +8446,28 @@ AD7314 all=m
 AD7745 all=m
 ADT75 all=m
 ATH6K_LEGACY all=n
+BATTERY_BQ20Z75 all=m
+BT_L2CAP all=y
+BT_SCO all=y
 COMPUTONE all=m
 CRYPTO_LZF all=m
 CS5535_GPIO i386=m
 DEBUG_SPINLOCK_SLEEP all=n
 DIGIEPCA all=m
+DISPLAY_SUPPORT all=m
+DRM_PSB all=m
+DRM_PSB_CDV all=y
+DRM_PSB_MFLD all=y
+DRM_PSB_MRST all=y
+EARLY_PRINTK_MRST all=n
 EASYCAP_OSS all=n
 EASYCAP_SND all=y
 ET131X_DEBUG all=n
 GPIO_BASIC_MMIO all=m
 GPIO_BASIC_MMIO_CORE all=m
+HID_QUANTA all=m
 HYPERV_BLOCK all=m
+HYPERV_MOUSE all=m
 I2C_DESIGNWARE powerpc=m
 IBM_NEW_EMAC ppc64=m
 IBM_NEW_EMAC_DEBUG ppc64=n
@@ -8373,6 +8480,10 @@ IIO_RING_BUFFER all=y
 INPUT_ATI_REMOTE all=m sparc=n
 ISTALLION all=m
 IWLAGN all=m
+IWLWIFI_DEVICE_SVTOOL all=y
+IWLWIFI_LEGACY all=m
+IWLWIFI_LEGACY_DEBUG all=n
+IWLWIFI_LEGACY_DEVICE_TRACING all=n
 IWL_P2P all=n
 LEDS_ALIX2 all=m
 LEDS_GPIO_OF powerpc=y sparc=y
@@ -8380,6 +8491,7 @@ LEDS_GPIO_PLATFORM all=y
 LOGIWII_FF all=y
 LOOPBACK_TARGET_CDB_DEBUG all=n
 MFD_SUPPORT all=y
+MISC_DEVICES all=y
 MMC_SDHCI_OF powerpc=m
 MTD_DEBUG all=n
 MYRI_SBUS sparc=m sparc64=m
@@ -8393,15 +8505,25 @@ NET_POCKET all=y
 NET_VENDOR_SMC alpha=y i386=y
 NFC_DEVICES all=y
 NFSD_DEPRECATED all=n
+POHMELFS all=m
 POHMELFS_CRYPTO all=y
+POHMELFS_DEBUG all=n
 RIO all=m
 RIO_OLDPCI all=n ia64=y ppc=y ppc64=y
 RISCOM8 all=m
 SCSI_ARCMSR_AER all=y
-SECURITY_APPARMOR_COMPAT_24=y
+SERIAL_MAX3107_AAVA all=m
+SIGMA all=m
+SND_INTELMID all=n
+SND_INTEL_SST all=m
+SND_SOC_CACHE_LZO all=y
 SND_SOC_TVL320AIC32X4 all=m
 SND_SOC_WM8915 all=m
 SPECIALIX all=m
+SPECTRA all=m
+SPECTRA_EMU all=n
+SPECTRA_MRST_HW all=n
+SPECTRA_MTD all=y
 STALLION all=m
 STMMAC_DUAL_MAC all=y
 SX all=m
@@ -8410,6 +8532,7 @@ USB_GADGET_AT91 all=n
 USB_GADGET_ATMEL_USBA all=n
 USB_GADGET_CI13XXX_PCI all=n
 USB_GADGET_DUMMY_HCD all=y
+USB_GADGET_DWC3 all=m
 USB_GADGET_EG20T all=n
 USB_GADGET_FSL_USB2 all=n
 USB_GADGET_FUSB300 all=n
@@ -8422,5 +8545,7 @@ USB_GADGET_PXA_U2O all=n
 USB_GADGET_R8A66597 all=n
 USB_GADGET_S3C2410 all=n
 USB_GADGET_SELECTED all=y
+USB_LANGWELL_OTG all=m
 WL12XX_HT all=y
+WL12XX_SDIO_TEST all=m
 XEN_PLATFORM_PCI all=m

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 14e5b2d696b4797dff4f7f2ef7c1d68fe8c793b8..d38c21804266c3f3e6c7cc94975455e10b69416e 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -144,141 +144,4 @@ Please read the FAQ at  http://www.tux.org/lkml/
 
 
 
-From:  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-To:    linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com
-Subject: [PATCH] small fixes to 3.3 (and 3.2) CPU hotplug code. (v1)
-Date:  Wed,  1 Feb 2012 16:16:38 -0500
-
-While I was playing with 'xm vcpu-set X N' I realized that the VCPU hotplug
-code in 3.2 spews tons of messages. Found out that we were missing an preempt_*
-call. While at it, I fixed also an annoying message ("XENBUS: Unable to ..")
-that shows up during bootup.
-
-Anyhow, these are going for 3.3 and CC-ing stable on the:
- [PATCH 1/2] xen/smp: Fix CPU online/offline bug triggering a BUG:
-
---
-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/
-
-From:  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-To:    linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com
-Subject: [PATCH 1/2] xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic.
-Date:  Wed,  1 Feb 2012 16:16:39 -0500
-
-When a user offlines a VCPU and then onlines it, we get:
-
-NMI watchdog disabled (cpu2): hardware events not enabled
-BUG: scheduling while atomic: swapper/2/0/0x00000002
-Modules linked in: dm_multipath dm_mod xen_evtchn iscsi_boot_sysfs iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi scsi_mod libcrc32c crc32c radeon fbco
- ttm bitblit softcursor drm_kms_helper xen_blkfront xen_netfront xen_fbfront fb_sys_fops sysimgblt sysfillrect syscopyarea xen_kbdfront xenfs [last unloaded:
-
-Pid: 0, comm: swapper/2 Tainted: G           O 3.2.0phase15.1-00003-gd6f7f5b-dirty #4
-Call Trace:
- [<ffffffff81070571>] __schedule_bug+0x61/0x70
- [<ffffffff8158eb78>] __schedule+0x798/0x850
- [<ffffffff8158ed6a>] schedule+0x3a/0x50
- [<ffffffff810349be>] cpu_idle+0xbe/0xe0
- [<ffffffff81583599>] cpu_bringup_and_idle+0xe/0x10
-
-The reason for this should be obvious from this call-chain:
-cpu_bringup_and_idle:
- \- cpu_bringup
-  |   \-[preempt_disable]
-  |
-  |- cpu_idle
-       \- play_dead [assuming the user offlined the VCPU]
-       |     \
-       |     +- (xen_play_dead)
-       |          \- HYPERVISOR_VCPU_off [so VCPU is dead, once user
-       |          |                       onlines it starts from here]
-       |          \- cpu_bringup [preempt_disable]
-       |
-       +- preempt_enable_no_reschedule()
-       +- schedule()
-       \- preempt_enable()
-
-So we have two preempt_disble() and one preempt_enable(). Calling
-preempt_enable() after the cpu_bringup() in the xen_play_dead
-fixes the imbalance.
-
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
----
- arch/x86/xen/smp.c |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index 041d4fe..501d4e0 100644
---- a/arch/x86/xen/smp.c
-+++ b/arch/x86/xen/smp.c
-@@ -409,6 +409,13 @@ static void __cpuinit xen_play_dead(void) /* used only with HOTPLUG_CPU */
-       play_dead_common();
-       HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
-       cpu_bringup();
-+      /*
-+       * Balance out the preempt calls - as we are running in cpu_idle
-+       * loop which has been called at bootup from cpu_bringup_and_idle.
-+       * The cpucpu_bringup_and_idle called cpu_bringup which made a
-+       * preempt_disable() So this preempt_enable will balance it out.
-+       */
-+      preempt_enable();
- }
- 
- #else /* !CONFIG_HOTPLUG_CPU */
--- 
-1.7.7.5
-
---
-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/
-
-From:  Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-To:    linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com
-Subject: [PATCH 2/2] xen/bootup: During bootup suppress XENBUS: Unable to read cpu state
-Date:  Wed,  1 Feb 2012 16:16:40 -0500
-
-When the initial domain starts, it prints (depending on the
-amount of CPUs) a slew of
-XENBUS: Unable to read cpu state
-XENBUS: Unable to read cpu state
-XENBUS: Unable to read cpu state
-XENBUS: Unable to read cpu state
-
-which provide no useful information - as the error is a valid
-issue - but not on the initial domain. The reason is that the
-XenStore is not accessible at that time (it is after all the
-first guest) so the CPU hotplug watch cannot parse "availability/cpu"
-attribute.
-
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
----
- drivers/xen/cpu_hotplug.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
-index 14e2d99..4dcfced 100644
---- a/drivers/xen/cpu_hotplug.c
-+++ b/drivers/xen/cpu_hotplug.c
-@@ -30,7 +30,8 @@ static int vcpu_online(unsigned int cpu)
-       sprintf(dir, "cpu/%u", cpu);
-       err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state);
-       if (err != 1) {
--              printk(KERN_ERR "XENBUS: Unable to read cpu state\n");
-+              if (!xen_initial_domain())
-+                      printk(KERN_ERR "XENBUS: Unable to read cpu state\n");
-               return err;
-       }
- 
--- 
-1.7.7.5
-
---
-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/kernel-x86.config b/kernel-x86.config
index 9979aacbb5fafda599dec850c9761203c50b07f5..420ccf70c8e728f3f7e10a2c77bbbeede5ad2cf6 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -192,7 +192,6 @@ CPU_SUP_CENTAUR x86=y
 STRICT_DEVMEM x86=y
 X86_VERBOSE_BOOTUP x86=n
 EARLY_PRINTK x86=y
-EARLY_PRINTK_MRST x86=n
 EARLY_PRINTK_DBGP x86=n
 DEBUG_STACKOVERFLOW x86=n
 X86_PTDUMP x86=n
@@ -272,3 +271,8 @@ DEBUG_PER_CPU_MAPS x86=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.kmemcheck goes here
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+EARLY_PRINTK_MRST x86=n