- updated

Changed files:
    kernel-multiarch.config -> 1.6
    kernel-netfilter.config -> 1.46
    kernel-powerpc.config -> 1.6
    kernel-reiser4.patch -> 1.5
    kernel-x86.config -> 1.7

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 3f943860beacf5ad0fdeb82958ef756ca8cd9739..c52c19b967941506f8a3e0ede169f8720557af88 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -64,7 +64,7 @@ CRYPTO_RMD128 all=m
 CRYPTO_RMD160 all=m
 CRYPTO_RMD256 all=m
 CRYPTO_RMD320 all=m
-CRYPTO_SHA1 all=m
+CRYPTO_SHA1 all=y
 CRYPTO_SHA256 all=y
 CRYPTO_SHA512 all=m
 CRYPTO_TGR192 all=m
@@ -73,6 +73,7 @@ CRYPTO_WP512 all=m
 CRYPTO_AES all=m
 CRYPTO_AES_586 i386=m
 CRYPTO_AES_X86_64 x86_64=m
+CRYPTO_AES_NI_INTEL all=m
 CRYPTO_ANUBIS all=m
 CRYPTO_ARC4 all=m
 CRYPTO_BLOWFISH all=m
@@ -95,6 +96,8 @@ CRYPTO_TWOFISH_X86_64 x86_64=m
 #- Compression
 CRYPTO_DEFLATE all=m
 CRYPTO_LZO all=m
+CRYPTO_ZLIB all=m
+
 #- Random Number Generation
 CRYPTO_ANSI_CPRNG all=m
 #- file drivers/crypto/Kconfig goes here
@@ -458,6 +461,7 @@ HW_RANDOM_N2RNG sparc64=m
 HW_RANDOM_VIA i386=m
 HW_RANDOM_PASEMI ppc64=m
 HW_RANDOM_VIRTIO=m
+HW_RANDOM_TIMERIOMEM all=m
 
 #-
 #- *** FILE: drivers/char/ipmi/Kconfig ***
@@ -537,6 +541,7 @@ FSL_DMA ppc=y ppc64=y
 DMA_ENGINE all=y
 #- DMA Clients
 NET_DMA all=y
+ASYNC_TX_DMA all=y
 DMATEST all=n
 
 #-
@@ -633,6 +638,7 @@ HID_SUPPORT all=y
 HID all=m
 HID_DEBUG all=n
 HIDRAW all=y
+
 #- file drivers/hid/usbhid/Kconfig goes here
 HID_COMPAT all=n
 LOGITECH_FF all=y
@@ -641,6 +647,7 @@ PANTHERLORD_FF all=y
 GREENASIA_FF all=m
 THRUSTMASTER_FF all=m
 ZEROPLUS_FF all=m
+DRAGONRISE_FF all=m
 
 #-
 #- *** FILE: drivers/hid/usbhid/Kconfig ***
@@ -678,6 +685,11 @@ SENSORS_AMS ppc=m
 SENSORS_AMS_PMU ppc=y
 SENSORS_AMS_I2C ppc=y
 SENSORS_ASB100 all=m
+SENSORS_ATK0110 all=m
+SENSORS_G760A all=m
+SENSORS_LTC4215 all=m
+SENSORS_LM95241 all=m
+SENSORS_SHT15 all=m
 SENSORS_ATXP1 all=m
 SENSORS_DS1621 all=m
 SENSORS_I5K_AMB all=m
@@ -1083,6 +1095,7 @@ INPUT_YEALINK all=m sparc=n
 INPUT_CM109 all=m
 INPUT_UINPUT all=m sparc=n
 INPUT_PCF50633_PMU all=m
+INPUT_GPIO_ROTARY_ENCODER all=m
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -1134,6 +1147,8 @@ TABLET_USB_WACOM all=m
 #-
 INPUT_TOUCHSCREEN all=y
 TOUCHSCREEN_ADS7846 all=m sparc=n
+TOUCHSCREEN_AD7877 all=m
+TOUCHSCREEN_AD7879_I2C all=m
 TOUCHSCREEN_DA9034 all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GUNZE all=m
@@ -1287,7 +1302,11 @@ LEDS_WRAP i386=m
 LEDS_ALIX2 all=m
 LEDS_PCA9532 all=m
 LEDS_GPIO all=m
+LEDS_GPIO_PLATFORM all=y
+LEDS_LP5521 all=m
 LEDS_CLEVO_MAIL all=m
+LEDS_DAC124S085 all=m
+LEDS_BD2802 all=m
 LEDS_PCA955X all=m
 LEDS_WM8350 all=m
 LEDS_DA903X all=m
@@ -1298,6 +1317,7 @@ LEDS_TRIGGER_IDE_DISK all=y
 LEDS_TRIGGER_HEARTBEAT all=m
 LEDS_TRIGGER_BACKLIGHT all=m
 LEDS_TRIGGER_DEFAULT_ON all=m
+LEDS_TRIGGER_GPIO all=m
 
 #-
 #- *** FILE: drivers/lguest/Kconfig ***
@@ -1385,7 +1405,7 @@ VIDEO_SAA7146_VV all=m
 #- *** FILE: drivers/media/common/tuners/Kconfig ***
 #-
 MEDIA_ATTACH all=y
-MEDIA_TUNER_CUSTOMIZE all=n
+MEDIA_TUNER_CUSTOMISE all=n
 
 #-
 #- *** FILE: drivers/media/dvb/Kconfig ***
@@ -1436,6 +1456,7 @@ DVB_DM1105 all=m
 DVB_USB all=m
 DVB_USB_DEBUG all=n
 DVB_USB_A800 all=m
+DVB_USB_CE6230 all=m
 DVB_USB_DIBUSB_MB all=m
 DVB_USB_DIBUSB_MB_FAULTY all=n
 DVB_USB_DIBUSB_MC all=m
@@ -1748,6 +1769,9 @@ USB_GSPCA all=m
 #- file drivers/media/video/gspca/stv06xx/Kconfig goes here
 USB_GSPCA_CONEX all=m
 USB_GSPCA_ETOMS all=m
+USB_GSPCA_MR97310A all=m
+USB_GSPCA_SQ905 all=m
+USB_GSPCA_SQ905C all=m
 USB_GSPCA_FINEPIX all=m
 USB_GSPCA_MARS all=m
 USB_GSPCA_OV519 all=m
@@ -1793,11 +1817,17 @@ VIDEO_PVRUSB2_SYSFS all=y sparc=n
 VIDEO_PVRUSB2_DVB all=y sparc=n
 VIDEO_PVRUSB2_DEBUGIFC all=n
 
+VIDEO_HDPVR all=m
+VIDEO_CX231XX all=m
+VIDEO_CX231XX_ALSA all=m
+VIDEO_CX231XX_DVB all=m
+
 #-
 #- *** FILE: drivers/media/video/pwc/Kconfig ***
 #-
 USB_PWC all=m
 USB_PWC_DEBUG all=n
+USB_PWC_INPUT_EVDEV all=y
 
 #-
 #- *** FILE: drivers/media/video/saa7134/Kconfig ***
@@ -1928,6 +1958,9 @@ HP_ILO all=m
 SGI_GRU ia64=m x86_64=m
 SGI_GRU_DEBUG ia64=n x86_64=n
 DELL_LAPTOP all=m
+DELL_WMI all=m
+ISL29003 all=m
+
 #- file drivers/misc/c2port/Kconfig goes here
 #- file drivers/misc/eeprom/Kconfig goes here
 
@@ -2152,6 +2185,7 @@ MTD_UBI_DEBUG all=n
 #- *** FILE: drivers/net/Kconfig ***
 #-
 NETDEVICES all=y
+COMPAT_NET_DEV_OPS all=n
 IFB all=m
 DUMMY all=m
 BONDING all=m
@@ -2195,6 +2229,7 @@ ULTRA32 alpha=m i386=m
 SMC9194 alpha=m i386=m
 ENC28J60 all=m
 ENC28J60_WRITEVERIFY all=n
+ETHOC all=m
 NET_VENDOR_RACAL alpha=y i386=y
 NI5010 i386=m
 NI52 alpha=m i386=m
@@ -2271,6 +2306,7 @@ IP1000 all=m
 IGB all=m
 IGB_LRO all=y
 IGB_DCA all=y
+IGBVF all=m
 #- file drivers/net/ixp2000/Kconfig goes here
 MYRI_SBUS sparc=m sparc64=m
 NS83820 all=m
@@ -2307,6 +2343,8 @@ IXGBE_DCA all=y
 IXGBE_DCB all=y
 IXGB all=m sparc=n
 S2IO all=m sparc=n
+VXGE all=m
+VXGE_DEBUG_TRACE_ALL all=n
 MYRI10GE all=m sparc=n
 MYRI10GE_DCA all=y sparc=n
 NETXEN_NIC all=m sparc=n
@@ -2542,6 +2580,7 @@ USB_RTL8150 all=m
 USB_USBNET all=m
 USB_NET_AX8817X all=m
 USB_NET_CDCETHER all=m
+USB_NET_CDC_EEM all=m
 USB_NET_DM9601 all=m
 USB_NET_SMSC95XX all=m
 USB_NET_GL620A all=m
@@ -2626,6 +2665,7 @@ LIBERTAS_SDIO all=m
 LIBERTAS_DEBUG all=n
 LIBERTAS_THINFIRM all=m
 LIBERTAS_THINFIRM_USB all=m
+LIBERTAS_SPI all=m
 AIRO all=m
 HERMES all=m
 HERMES_CACHE_FW_ON_INIT all=y
@@ -2639,6 +2679,7 @@ PCMCIA_SPECTRUM all=m
 ATMEL all=m
 PCI_ATMEL all=m
 PCMCIA_ATMEL all=m
+AT76C50X_USB all=m
 AIRO_CS all=m
 PCMCIA_WL3501 all=m
 PRISM54 all=m
@@ -2648,6 +2689,7 @@ RTL8180 all=m
 RTL8187 all=m
 ADM8211 all=m
 MAC80211_HWSIM all=m
+MWL8K all=m
 #- file drivers/net/wireless/p54/Kconfig goes here
 #- file drivers/net/wireless/ath5k/Kconfig goes here
 #- file drivers/net/wireless/ath9k/Kconfig goes here
@@ -2671,6 +2713,8 @@ ATH5K_DEBUG all=n
 ATH9K all=m
 ATH9K_DEBUG all=n
 
+AR9170_USB all=m
+
 #-
 #- *** FILE: drivers/net/wireless/b43/Kconfig ***
 #-
@@ -2715,8 +2759,11 @@ LIBIPW_DEBUG all=n
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
 #-
 IWLCORE all=m
+IWLWIFI all=m
 IWLWIFI_RFKILL all=y
 IWLWIFI_DEBUG all=y
+IWLWIFI_LEDS all=y
+IWLWIFI_SPECTRUM_MEASUREMENT all=y
 IWLAGN all=m
 IWLAGN_SPECTRUM_MEASUREMENT all=y
 IWLAGN_LEDS all=y
@@ -2734,6 +2781,7 @@ IWL3945_DEBUG all=n
 P54_COMMON all=m
 P54_USB all=m
 P54_PCI all=m
+P54_SPI all=m
 
 #-
 #- *** FILE: drivers/net/wireless/rt2x00/Kconfig ***
@@ -2787,6 +2835,7 @@ PCI_LEGACY all=y
 PCI_DEBUG all=n
 PCI_STUB all=m
 HT_IRQ i386=y x86_64=y
+PCI_IOV i386=y x86_64=y
 
 #-
 #- *** FILE: drivers/pci/hotplug/Kconfig ***
@@ -2862,6 +2911,7 @@ THINKPAD_ACPI_DEBUG i386=n x86_64=n
 THINKPAD_ACPI_BAY i386=y x86_64=y
 THINKPAD_ACPI_VIDEO all=y
 THINKPAD_ACPI_HOTKEY_POLL all=y
+THINKPAD_ACPI_UNSAFE_LEDS all=n
 INTEL_MENLOW all=m
 EEEPC_LAPTOP all=m
 ACPI_WMI all=m
@@ -2920,6 +2970,7 @@ REGULATOR_WM8350 all=m
 REGULATOR_WM8400 all=m
 REGULATOR_DA903X all=m
 REGULATOR_PCF50633 all=m
+REGULATOR_FIXED_VOLTAGE all=m
 
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
@@ -3010,6 +3061,10 @@ SCSI_MULTI_LUN all=y
 SCSI_CONSTANTS all=n
 SCSI_LOGGING all=y
 SCSI_SCAN_ASYNC all=y
+SCSI_OSD_INITIATOR all=m
+SCSI_OSD_ULD all=m
+SCSI_OSD_DPRINT_SENSE all=1
+SCSI_OSD_DEBUG all=n
 SCSI_WAIT_SCAN all=m
 SCSI_SPI_ATTRS all=m
 SCSI_FC_ATTRS all=m
@@ -3045,6 +3100,7 @@ SCSI_BUSLOGIC all=m
 SCSI_FLASHPOINT i386=n
 LIBFC all=m
 FCOE all=m
+FCOE_FNIC all=m
 SCSI_DMX3191D all=m
 SCSI_DTC3280 alpha=m i386=m
 SCSI_EATA all=m
@@ -3165,6 +3221,10 @@ SCSI_SAS_ATA all=y
 SCSI_SAS_HOST_SMP all=y
 SCSI_SAS_LIBSAS_DEBUG all=n
 
+SCSI_MPT2SAS all=m
+SCSI_MPT2SAS_MAX_SGE all=128
+SCSI_MPT2SAS_LOGGING all=y
+
 #-
 #- *** FILE: drivers/scsi/megaraid/Kconfig.megaraid ***
 #-
@@ -3216,6 +3276,7 @@ SERIAL_8250_DETECT_IRQ all=y
 SERIAL_8250_RSA all=y
 SERIAL_8250_MCA i386=m
 #- Non-8250 serial port support
+SERIAL_MAX3100 all=m
 SERIAL_UARTLITE ppc=m
 SERIAL_SUNCORE sparc=y sparc64=y
 SERIAL_SUNZILOG sparc=y sparc64=y
@@ -3337,6 +3398,7 @@ USB_ATMEL all=m
 COMEDI all=m
 COMEDI_PCI_DRIVERS all=m
 COMEDI_USB_DRIVERS all=m
+COMEDI_DEBUG all=n
 
 #-
 #- *** FILE: drivers/staging/echo/Kconfig ***
@@ -3348,6 +3410,30 @@ ECHO all=m
 #-
 EPL all=m
 
+
+DST all=m
+DST_DEBUG all=n
+
+POHMELFS all=m
+POHMELFS_DEBUG all=n
+POHMELFS_CRYPTO all=y
+
+STLC45XX all=m
+
+USB_SERIAL_ATEN2011 all=m
+
+B3DFG all=m
+
+IDE_PHISON all=m
+
+PLAN9AUTH all=m
+
+HECI all=m
+
+LINE6_USB all=m
+
+USB_SERIAL_QUATECH_ESU100 all=m
+
 #-
 #- *** FILE: drivers/staging/et131x/Kconfig ***
 #-
@@ -3419,6 +3505,8 @@ RT2860 all=m
 #-
 RT2870 all=m
 
+RT3070 all=m
+
 #-
 #- *** FILE: drivers/staging/rtl8187se/Kconfig ***
 #-
@@ -3472,6 +3560,7 @@ UIO_PDRV all=m
 UIO_PDRV_GENIRQ all=m
 UIO_SMX all=m
 UIO_SERCOS3 all=m
+UIO_AEC all=m
 
 #-
 #- *** FILE: drivers/usb/Kconfig ***
@@ -3662,6 +3751,7 @@ USB_MUSB_HDRC all=n
 #- OTG and related infrastructure
 USB_GPIO_VBUS all=m
 TWL4030_USB all=m
+NOP_USB_XCEIV all=m
 
 #-
 #- *** FILE: drivers/usb/serial/Kconfig ***
@@ -3676,6 +3766,9 @@ USB_SERIAL_CH341 all=m
 USB_SERIAL_WHITEHEAT all=m
 USB_SERIAL_DIGI_ACCELEPORT all=m
 USB_SERIAL_CP2101 all=m
+USB_SERIAL_CP210X all=m
+USB_SERIAL_QUALCOMM all=m
+USB_SERIAL_SYMBOL all=m
 USB_SERIAL_CYPRESS_M8 all=m
 USB_SERIAL_EMPEG all=m
 USB_SERIAL_FTDI_SIO all=m
@@ -3732,17 +3825,17 @@ USB_SERIAL_DEBUG all=m
 #- see USB_STORAGE Help for more information
 USB_STORAGE all=m
 USB_STORAGE_DEBUG all=n
-USB_STORAGE_DATAFAB all=y
-USB_STORAGE_FREECOM all=y
-USB_STORAGE_ISD200 all=y
-USB_STORAGE_USBAT all=y
-USB_STORAGE_SDDR09 all=y
-USB_STORAGE_SDDR55 all=y
-USB_STORAGE_JUMPSHOT all=y
-USB_STORAGE_ALAUDA all=y
-USB_STORAGE_ONETOUCH all=y
-USB_STORAGE_KARMA all=y
-USB_STORAGE_CYPRESS_ATACB all=y
+USB_STORAGE_DATAFAB all=m
+USB_STORAGE_FREECOM all=m
+USB_STORAGE_ISD200 all=m
+USB_STORAGE_USBAT all=m
+USB_STORAGE_SDDR09 all=m
+USB_STORAGE_SDDR55 all=m
+USB_STORAGE_JUMPSHOT all=m
+USB_STORAGE_ALAUDA all=m
+USB_STORAGE_ONETOUCH all=m
+USB_STORAGE_KARMA all=m
+USB_STORAGE_CYPRESS_ATACB all=m
 USB_LIBUSUAL all=y
 
 #-
@@ -3859,6 +3952,8 @@ FB_NEOMAGIC all=m
 FB_KYRO all=m
 FB_3DFX all=m sparc=n
 FB_3DFX_ACCEL all=y ia64=n sparc64=n
+FB_3DFX_I2C all=y
+FB_BROADSHEET all=m
 FB_VOODOO1 all=m
 FB_VT8623 all=m sparc=n
 FB_CYBLA i386=m
@@ -4115,6 +4210,7 @@ LOCKD_V4 all=y
 EXPORTFS all=m
 NFS_ACL_SUPPORT all=m
 NFS_COMMON all=y
+NFS_FSCACHE all=y
 #- file net/sunrpc/Kconfig goes here
 #- file fs/smbfs/Kconfig goes here
 #- file fs/cifs/Kconfig goes here
@@ -4152,6 +4248,7 @@ AFFS_FS all=m
 #-
 AFS_FS all=m
 AFS_DEBUG all=n
+AFS_FSCACHE all=y
 
 #-
 #- *** FILE: fs/autofs/Kconfig ***
@@ -4240,6 +4337,7 @@ EXT3_FS all=m
 EXT3_FS_XATTR all=y
 EXT3_FS_POSIX_ACL all=y
 EXT3_FS_SECURITY all=y
+EXT3_DEFAULTS_TO_ORDERED all=n
 
 #-
 #- *** FILE: fs/ext4/Kconfig ***
@@ -4273,7 +4371,7 @@ FUSE_FS all=m
 #- *** FILE: fs/gfs2/Kconfig ***
 #-
 GFS2_FS all=m
-GFS2_FS_LOCKING_DLM all=m
+GFS2_FS_LOCKING_DLM all=y
 
 #-
 #- *** FILE: fs/hfs/Kconfig ***
@@ -4452,6 +4550,15 @@ OCFS2_FS_POSIX_ACL all=n
 #-
 OMFS_FS all=m
 
+# Caches
+FSCACHE all=m
+FSCACHE_STATS=y
+FSCACHE_HISTOGRAM all=n
+FSCACHE_DEBUG all=n
+CACHEFILES all=m
+CACHEFILES_DEBUG all=n
+CACHEFILES_HISTOGRAM all=n
+
 #-
 #- *** FILE: fs/partitions/Kconfig ***
 #-
@@ -4548,6 +4655,11 @@ UFS_FS all=m
 UFS_FS_WRITE all=n
 UFS_DEBUG all=n
 
+EXOFS_FS all=m
+EXOFS_DEBUG all=n
+
+NILFS2_FS all=m
+
 #-
 #- *** FILE: fs/xfs/Kconfig ***
 #-
@@ -4615,6 +4727,7 @@ NET_NS all=y
 BLK_DEV_INITRD all=y
 #- file usr/Kconfig goes here
 CC_OPTIMIZE_FOR_SIZE all=n
+STRIP_ASM_SYMS all=y
 SYSCTL all=y
 ANON_INODES all=y
 EMBEDDED all=n
@@ -4701,6 +4814,10 @@ IRQSOFF_TRACER all=n
 SYSPROF_TRACER all=n
 SCHED_TRACER all=n
 CONTEXT_SWITCH_TRACER all=n
+EVENT_TRACER all=n
+FTRACE_SYSCALLS all=n
+KMEMTRACE all=n
+WORKQUEUE_TRACER all=n
 BOOT_TRACER all=n
 TRACE_BRANCH_PROFILING all=n
 POWER_TRACER all=n
@@ -4753,6 +4870,8 @@ DEBUG_KERNEL all=y
 DEBUG_SHIRQ all=n
 DETECT_SOFTLOCKUP all=y
 BOOTPARAM_SOFTLOCKUP_PANIC all=n
+DETECT_HUNG_TASK all=y
+BOOTPARAM_HUNG_TASK_PANIC all=n
 SCHED_DEBUG all=n
 SCHEDSTATS all=n
 TIMER_STATS all=y
@@ -4794,6 +4913,8 @@ PROVIDE_OHCI1394_DMA_INIT all=n
 FIREWIRE_OHCI_REMOTE_DMA all=n
 BUILD_DOCSRC all=n
 DYNAMIC_PRINTK_DEBUG all=n
+DYNAMIC_DEBUG all=n
+DMA_API_DEBUG all=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 
@@ -4817,6 +4938,7 @@ MIGRATION all=y
 ZONE_DMA_FLAG all=1 sparc64=0
 NR_QUICK sparc64=1
 UNEVICTABLE_LRU all=y
+DEFAULT_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 
 #-
 #- *** FILE: net/8021q/Kconfig ***
@@ -4846,6 +4968,8 @@ INET all=y
 #- file net/ipv6/Kconfig goes here
 #- file net/netlabel/Kconfig goes here
 NETWORK_SECMARK all=y
+RDS all=m
+RDS_DEBUG all=n
 NETFILTER all=y
 NETFILTER_DEBUG all=n
 NETFILTER_ADVANCED all=y
@@ -4875,6 +4999,7 @@ BRIDGE_NETFILTER all=y
 #- file net/dcb/Kconfig goes here
 NET_PKTGEN all=m
 NET_TCPPROBE all=m
+NET_DROP_MONITOR all=y
 #- file net/ax25/Kconfig goes here
 #- file net/can/Kconfig goes here
 #- file net/irda/Kconfig goes here
@@ -5355,7 +5480,6 @@ SECURITY_NETWORK all=y
 SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
 SECURITY_FILE_CAPABILITIES all=y
-SECURITY_DEFAULT_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 #- file security/selinux/Kconfig goes here
 #- file security/smack/Kconfig goes here
 
@@ -5376,6 +5500,10 @@ SECURITY_SELINUX_POLICYDB_VERSION_MAX all=n
 #-
 SECURITY_SMACK all=y
 
+SECURITY_TOMOYO all=y
+
+IMA all=y
+
 #-
 #- *** FILE: sound/Kconfig ***
 #-
@@ -5578,6 +5706,8 @@ SND_MIA all=m
 SND_ECHO3G all=m
 SND_INDIGO all=m
 SND_INDIGOIO all=m
+SND_INDIGOIOX all=m
+SND_INDIGODJX all=m
 SND_INDIGODJ all=m
 SND_EMU10K1 all=m
 SND_EMU10K1X all=m

diff --git a/kernel-netfilter.config b/kernel-netfilter.config
index 1fb9f718071f08c48c9577b37363dfafe3b4be71..11b06bff4556a09fc970b8766e0b4a3545bb8add 100644 (file)
--- a/kernel-netfilter.config
+++ b/kernel-netfilter.config
@@ -30,6 +30,7 @@ CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
@@ -38,6 +39,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m

diff --git a/kernel-powerpc.config b/kernel-powerpc.config
index 5272e15b30a96f93223f733c82b317f61585e10a..f526540edfce1285383e25dd0a9df754be42cb00 100644 (file)
--- a/kernel-powerpc.config
+++ b/kernel-powerpc.config
@@ -35,6 +35,7 @@ CMDLINE_BOOL powerpc=n
 EXTRA_TARGETS powerpc=""
 #- file kernel/power/Kconfig goes here
 SECCOMP powerpc=y
+CC_STACKPROTECTOR powerpc=n
 ISA ppc=n
 #- file drivers/pci/pcie/Kconfig goes here
 #- file drivers/pci/Kconfig goes here

diff --git a/kernel-reiser4.patch b/kernel-reiser4.patch
index 6dc3bdc6e7c64b124636e1dbfbeb29d2c1d67f99..5119a27fc68d2f04334d44036a74c2f1c3839d91 100644 (file)
--- a/kernel-reiser4.patch
+++ b/kernel-reiser4.patch
@@ -39396,8 +39396,8 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/file_plugin_common.c linux-2.6.28/
 +      if (!reiser4_inode_get_flag(inode, REISER4_NO_SD)) {
 +              reiser4_key sd_key;
 +
-+              DQUOT_FREE_INODE(inode);
-+              DQUOT_DROP(inode);
++              vfs_dq_free_inode(inode);
++              vfs_dq_drop(inode);
 +
 +              build_sd_key(inode, &sd_key);
 +              result =
@@ -40274,7 +40274,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +              if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid)
 +                  || (attr->ia_valid & ATTR_GID
 +                      && attr->ia_gid != inode->i_gid)) {
-+                      result = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
++                      result = vfs_dq_transfer(inode, attr) ? -EDQUOT : 0;
 +                      if (result) {
 +                              context_set_commit_async(ctx);
 +                              reiser4_exit_context(ctx);
@@ -40412,8 +40412,8 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +      /* So that on error iput will be called. */
 +      *retobj = object;
 +
-+      if (DQUOT_ALLOC_INODE(object)) {
-+              DQUOT_DROP(object);
++      if (vfs_dq_alloc_inode(object)) {
++              vfs_dq_drop(object);
 +              object->i_flags |= S_NOQUOTA;
 +              return RETERR(-EDQUOT);
 +      }
@@ -40427,7 +40427,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +      if (result) {
 +              warning("nikita-431", "Cannot install plugin %i on %llx",
 +                      data->id, (unsigned long long)get_inode_oid(object));
-+              DQUOT_FREE_INODE(object);
++              vfs_dq_free_inode(object);
 +              object->i_flags |= S_NOQUOTA;
 +              return result;
 +      }
@@ -40436,7 +40436,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +      obj_plug = inode_file_plugin(object);
 +
 +      if (obj_plug->create_object == NULL) {
-+              DQUOT_FREE_INODE(object);
++              vfs_dq_free_inode(object);
 +              object->i_flags |= S_NOQUOTA;
 +              return RETERR(-EPERM);
 +      }
@@ -40455,7 +40455,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +              warning("nikita-432", "Cannot inherit from %llx to %llx",
 +                      (unsigned long long)get_inode_oid(parent),
 +                      (unsigned long long)get_inode_oid(object));
-+              DQUOT_FREE_INODE(object);
++              vfs_dq_free_inode(object);
 +              object->i_flags |= S_NOQUOTA;
 +              return result;
 +      }
@@ -40471,7 +40471,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +      /* obtain directory plugin (if any) for new object. */
 +      obj_dir = inode_dir_plugin(object);
 +      if (obj_dir != NULL && obj_dir->init == NULL) {
-+              DQUOT_FREE_INODE(object);
++              vfs_dq_free_inode(object);
 +              object->i_flags |= S_NOQUOTA;
 +              return RETERR(-EPERM);
 +      }
@@ -40480,7 +40480,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +
 +      reserve = estimate_create_vfs_object(parent, object);
 +      if (reiser4_grab_space(reserve, BA_CAN_COMMIT)) {
-+              DQUOT_FREE_INODE(object);
++              vfs_dq_free_inode(object);
 +              object->i_flags |= S_NOQUOTA;
 +              return RETERR(-ENOSPC);
 +      }
@@ -40511,7 +40511,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +                      warning("nikita-2219",
 +                              "Failed to create sd for %llu",
 +                              (unsigned long long)get_inode_oid(object));
-+              DQUOT_FREE_INODE(object);
++              vfs_dq_free_inode(object);
 +              object->i_flags |= S_NOQUOTA;
 +              return result;
 +      }
@@ -40554,7 +40554,7 @@ diff -urN linux-2.6.28.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.28/fs/reiser
 +       */
 +      reiser4_update_sd(object);
 +      if (result != 0) {
-+              DQUOT_FREE_INODE(object);
++              vfs_dq_free_inode(object);
 +              object->i_flags |= S_NOQUOTA;
 +              /* if everything was ok (result == 0), parent stat-data is
 +               * already updated above (update_parent_dir()) */

diff --git a/kernel-x86.config b/kernel-x86.config
index f7eaa7a227a673fa0976d64d880d4dc2c10b07d1..aaae9fe06997a75e9cae166cb5fdc49f8cb9362b 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -17,6 +17,7 @@ SMP x86=y
 SPARSE_IRQ i386=y x86_64=y
 NUMA_MIGRATE_IRQ_DESC i386=y x86_64=y
 X86_MPPARSE i386=y x86_64=n
+X86_EXTENDED_PLATFORM i386=y
 X86_PC x86=y
 X86_ELAN i386=n
 X86_VOYAGER i386=n
@@ -26,6 +27,7 @@ X86_SUMMIT i386=n
 X86_ES7000 i386=n
 X86_BIGSMP i386=n
 X86_VSMP x86_64=n
+X86_UV i386=n
 X86_VISWS i386=n
 X86_RDC321X i386=n
 SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
@@ -63,11 +65,12 @@ MICROCODE_INTEL x86=y
 MICROCODE_AMD x86=y
 X86_MSR x86=m
 X86_CPUID x86=m
+X86_CPU_DEBUG all=m
 NOHIGHMEM i386=n
 HIGHMEM4G i386=y
 HIGHMEM64G i386=n
 PAGE_OFFSET i386=0xC0000000
-DIRECT_GBPAGES x86=n
+DIRECT_GBPAGES x86=y
 NUMA x86_64=y
 #- NUMA (Summit) requires SMP, 64GB highmem support, ACPI
 K8_NUMA x86_64=n
@@ -87,6 +90,7 @@ MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
 EFI x86=y
 SECCOMP x86=y
+CC_STACKPROTECTOR x86=n
 #- file kernel/Kconfig.hz goes here
 KEXEC x86=y
 CRASH_DUMP x86=n
@@ -228,6 +232,8 @@ VIRTUALIZATION x86=y
 KVM x86=m
 KVM_INTEL x86=m
 KVM_AMD x86=m
+KVM_TRACE all=n
+
 #- file drivers/lguest/Kconfig goes here
 #- file drivers/virtio/Kconfig goes here