Update config options for 3.7

- Fix module blacklist patch to not leak a reference to the blacklist keyring

10 files changed, 161 insertions, 7 deletions

diff --git a/config-generic b/config-generic
index f14046eac..eb588f350 100644
--- a/config-generic
+++ b/config-generic
@@ -190,30 +190,76 @@ CONFIG_EXTRA_FIRMWARE=""
 # Memory Technology Devices (MTD)
 #
 CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
 # CONFIG_MTD_SWAP is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_TS5500 is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+# Self-contained MTD device drivers
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
 # CONFIG_MTD_DOCG3 is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_LPDDR is not set
 CONFIG_MTD_UBI=m
-
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
 
 #
 # Parallel port support
@@ -433,6 +479,7 @@ CONFIG_ATA_BMDMA=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_PIIX=y
+# CONFIG_SATA_HIGHBANK is not set
 CONFIG_ATA_ACPI=y
 CONFIG_BLK_DEV_SX8=m
 CONFIG_PDC_ADMA=m
@@ -603,6 +650,7 @@ CONFIG_TCP_MD5SIG=y
 # Networking options
 #
 CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_NET_KEY=m
@@ -682,6 +730,7 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_GRE is not set
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_MROUTE=y
@@ -825,7 +874,6 @@ CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -834,6 +882,7 @@ CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
@@ -866,6 +915,8 @@ CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_NF_NAT_IPV6=m
+# CONFIG_IP6_NF_TARGET_MASQUERADE is not set
+# CONFIG_IP6_NF_TARGET_NPT is not set
 
 #
 # Bridge: Netfilter Configuration
@@ -1055,6 +1106,7 @@ CONFIG_DUMMY=m
 CONFIG_BONDING=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_VETH=m
@@ -1307,6 +1359,7 @@ CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
 
 CONFIG_PHYLIB=y
+CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_BROADCOM_PHY=m
 CONFIG_BCM87XX_PHY=m
@@ -1362,6 +1415,7 @@ CONFIG_MLX4_EN_DCB=y
 CONFIG_SFC=m
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_SRIOV=y
+CONFIG_SFC_PTP=y
 
 # CONFIG_SFC_MTD is not set
 
@@ -1476,6 +1530,7 @@ CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
 CONFIG_BRCMFMAC_SDIO_OOB=y
 CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCMISCAN is not set
 # CONFIG_BRCMDBG is not set
 # CONFIG_HERMES is not set
 # CONFIG_HOSTAP is not set
@@ -2022,6 +2077,7 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_INFINEON is not set
@@ -2048,6 +2104,7 @@ CONFIG_CYCLADES=m
 # CONFIG_ISI is not set
 # CONFIG_RIO is not set
 CONFIG_SERIAL_JSM=m
+# CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_MFD_HSU is not set
 
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
@@ -2056,6 +2113,7 @@ CONFIG_SERIAL_JSM=m
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_KGDB_NMI is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
@@ -2144,6 +2202,7 @@ CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
@@ -2263,6 +2322,7 @@ CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
 
 # CONFIG_HMC6352 is not set
 # CONFIG_BMP085 is not set
@@ -2277,6 +2337,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_HDQ_MASTER_OMAP is not set
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_DS2408=m
@@ -2348,6 +2409,7 @@ CONFIG_W83697UG_WDT=m
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_TPM=m
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_RTC_DEBUG is not set
@@ -2381,6 +2443,7 @@ CONFIG_RTC_DRV_RS5C372=m
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_STK17TA8=m
 # CONFIG_RTC_DRV_S35390A is not set
 CONFIG_RTC_DRV_RX8581=m
@@ -2438,6 +2501,8 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
 # CONFIG_DRM_PSB is not set
@@ -2445,6 +2510,7 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX_FBCON is not set
 CONFIG_DRM_VGEM=m
 
 #
@@ -2519,6 +2585,7 @@ CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_IVTV=m
+# CONFIG_VIDEO_IVTV_ALSA is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -2530,6 +2597,8 @@ CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_RC=y
 CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZORAN_AVS6EYES=m
@@ -2593,6 +2662,7 @@ CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_PLUTO2=m
 CONFIG_SMS_SIANO_MDTV=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_SMS_USB_DRV=m
 CONFIG_SMS_SDIO_DRV=m
 CONFIG_DVB_TTUSB_DEC=m
@@ -2610,6 +2680,7 @@ CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
+# CONFIG_DVB_USB_V2 is not set
 
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
@@ -2622,7 +2693,10 @@ CONFIG_DVB_TTUSB_BUDGET=m
 
 CONFIG_DVB_USB_CINERGY_T2=m
 CONFIG_DVB_B2C2_FLEXCOP=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
 CONFIG_DVB_B2C2_FLEXCOP_USB=m
 # CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
 CONFIG_DVB_USB=m
@@ -2694,9 +2768,13 @@ CONFIG_IR_ENE=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
 CONFIG_IR_GPIO_CIR=m
 
 CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+
 # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
 
 #
@@ -3070,6 +3148,7 @@ CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=y
 CONFIG_HID_QUANTA=y
 CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_GYRATION=m
@@ -3089,6 +3168,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
+# CONFIG_HID_SENSOR_HUB is not set
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_UCLOGIC=m
@@ -3280,6 +3360,7 @@ CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 # CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_ZTE is not set
 CONFIG_USB_SERIAL_MOS7840=m
 CONFIG_USB_SERIAL_MOTOROLA=m
 CONFIG_USB_SERIAL_NAVMAN=m
@@ -3320,6 +3401,7 @@ CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_APPLEDISPLAY=m
+# CONFIG_OMAP_USB2 is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_C67X00_HCD is not set
@@ -3338,6 +3420,7 @@ CONFIG_USB_FILE_STORAGE=m
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
@@ -3588,6 +3671,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+# CONFIG_CIFS_SMB2 is not set
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
@@ -3759,6 +3843,7 @@ CONFIG_DEBUG_NX_TEST=m
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DEBUG_BOOT_PARAMS=y
 CONFIG_DEBUG_VM=y
+# CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
@@ -3772,7 +3857,6 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_LATENCYTOP=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -3923,6 +4007,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_PROGEAR=m
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -3974,10 +4060,15 @@ CONFIG_KEXEC=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_THERMAL_HWMON=y
+# CONFIG_CPU_THERMAL is not set
 
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 
+#
+# Bus devices
+#
+# CONFIG_OMAP_OCP2SCP is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 
@@ -4012,6 +4103,8 @@ CONFIG_NET_VENDOR_SMC=y
 
 # CONFIG_MOUSE_ATIXL is not set
 
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
+
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
@@ -4058,6 +4151,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_PCA9633 is not set
 CONFIG_LEDS_DELL_NETBOOKS=m
 # CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_OT200 is not set
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
@@ -4065,12 +4159,14 @@ CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LM3530=m
+# CONFIG_LEDS_LM3642 is not set
 CONFIG_LEDS_LM3556=m
 CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_LP3944=m
@@ -4104,6 +4200,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_FUNCTION_TRACER=y
 CONFIG_STACK_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
@@ -4319,9 +4417,19 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_WIMAX_GDM72XX is not set 
 # CONFIG_IPACK_BUS is not set
 # CONFIG_CSR_WIFI is not set
-#
+# CONFIG_ZCACHE2 is not set
+# CONFIG_NET_VENDOR_SILICOM is not set
+# CONFIG_SBYPASS is not set
+# CONFIG_BPCTL is not set
+# CONFIG_CED1401 is not set
+# CONFIG_DGRP is not set
 # END OF STAGING
 
+#
+# Remoteproc drivers (EXPERIMENTAL)
+#
+# CONFIG_STE_MODEM_RPROC is not set
+
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
diff --git a/config-powerpc-generic b/config-powerpc-generic
index a263acc80..a6ef1c4df 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -372,3 +372,11 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 
 # CONFIG_FAIL_IOMMU is not set
+
+# CONFIG_PPC_DENORMALISATION is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+
diff --git a/config-powerpc64 b/config-powerpc64
index ccd0e85d4..f5a4898d4 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -165,7 +165,10 @@ CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
 
 CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_CRYPTO_DEV_NX=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 
 
 CONFIG_BPF_JIT=y
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index ef6ac78e1..38ae0683c 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -156,7 +156,10 @@ CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
 
 CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_CRYPTO_DEV_NX=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 
 
 CONFIG_BPF_JIT=y
diff --git a/config-s390x b/config-s390x
index 451512e9a..41e41c53c 100644
--- a/config-s390x
+++ b/config-s390x
@@ -241,3 +241,12 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_CRYPTO_GHASH_S390=m
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
+
+CONFIG_BPF_JIT=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_SCM_BUS is not set
+# CONFIG_EADM_SCH is not set
+# CONFIG_SCM_BLOCK is not set
+# CONFIG_SCM_BLOCK_CLUSTER_WRITE is not set
+# CONFIG_S390_PTDUMP is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
diff --git a/config-sparc64-generic b/config-sparc64-generic
index ebc891d8a..e15e2ef18 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -201,3 +201,17 @@ CONFIG_CRYPTO_DEV_NIAGARA2=y
 CONFIG_BPF_JIT=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
+
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_CRYPTO_CRC32C_SPARC64 is not set
+# CONFIG_CRYPTO_MD5_SPARC64 is not set
+# CONFIG_CRYPTO_SHA1_SPARC64 is not set
+# CONFIG_CRYPTO_SHA256_SPARC64 is not set
+# CONFIG_CRYPTO_SHA512_SPARC64 is not set
+# CONFIG_CRYPTO_AES_SPARC64 is not set
+# CONFIG_CRYPTO_CAMELLIA_SPARC64 is not set
+# CONFIG_CRYPTO_DES_SPARC64 is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+
diff --git a/config-x86-32-generic b/config-x86-32-generic
index b1a04993a..1216d47e6 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -190,6 +190,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_X86_INTEL_MID is not set
 
 CONFIG_MFD_CS5535=m
+# CONFIG_MFD_SYSCON is not set
 
 # I2O enabled only for 32-bit x86, disabled for PAE kernel
 CONFIG_I2O=m
@@ -211,5 +212,8 @@ CONFIG_I2O_BUS=m
 # CONFIG_GEOS is not set
 # CONFIG_NET5501 is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_GPIO_ADNP is not set
 # CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_RTC_DRV_SNVS is not set
diff --git a/config-x86-generic b/config-x86-generic
index b26f42d9f..2bcd498eb 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -91,10 +91,11 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 # CONFIG_ACPI_APEI_EINJ is not set
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=m
+CONFIG_ACPI_BGRT=y
 
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_POWERNOW_K8=y
 CONFIG_X86_P4_CLOCKMOD=y
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 342b8620a..6003f11c0 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -46,6 +46,8 @@ CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_BLOWFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
@@ -107,6 +109,7 @@ CONFIG_X86_X2APIC=y
 CONFIG_SPARSE_IRQ=y
 
 CONFIG_RCU_FANOUT=64
+# CONFIG_RCU_USER_QS is not set
 
 CONFIG_INTEL_TXT=y
 
diff --git a/kernel.spec b/kernel.spec
index 8bbe22510..d9b8503a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2318,6 +2318,7 @@ fi
 #                 ||     ||
 %changelog
 * Tue Oct 30 2012 Josh Boyer <jwboyer@redhat.com>
+- Update config options for 3.7
 - Fix module blacklist patch to not leak a reference to the blacklist keyring
 
 * Tue Oct 30 2012 Josh Boyer <jwboyer@redhat.com> - 3.7.0-0.rc3.git0.1