[kernel] Update config options
Josh Boyer
jwboyer at fedoraproject.org
Mon Jul 30 23:14:32 UTC 2012
commit f7572813ba8f6229b441cf19bcb999e99b4936e7
Author: Josh Boyer <jwboyer at redhat.com>
Date: Mon Jul 30 19:13:04 2012 -0400
Update config options
Makefile.release | 1 +
config-debug | 1 +
config-generic | 27 +++++++++++++++++++++++++++
config-nodebug | 1 +
config-powerpc-generic | 2 ++
config-sparc64-generic | 1 +
config-x86-32-generic | 2 --
config-x86-generic | 4 ++++
config-x86_64-generic | 3 +++
kernel.spec | 5 ++++-
10 files changed, 44 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.release b/Makefile.release
index e3ad807..ee811ba 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -68,6 +68,7 @@ config-release:
@perl -pi -e 's/CONFIG_DETECT_HUNG_TASK=y/# CONFIG_DETECT_HUNG_TASK is not set/' config-nodebug
@perl -pi -e 's/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_KMEMLEAK=y/# CONFIG_DEBUG_KMEMLEAK is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_MAC80211_MESSAGE_TRACING=y/# CONFIG_MAC80211_MESSAGE_TRACING is not set/' config-nodebug
@# Undo anything that make extremedebug might have set
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
diff --git a/config-debug b/config-debug
index b9334f4..db0aa6d 100644
--- a/config-debug
+++ b/config-debug
@@ -111,3 +111,4 @@ CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_MAC80211_MESSAGE_TRACING=y
diff --git a/config-generic b/config-generic
index b822a84..8ae2916 100644
--- a/config-generic
+++ b/config-generic
@@ -629,6 +629,7 @@ CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_ARPD=y
CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@@ -709,6 +710,7 @@ CONFIG_NF_CONNTRACK=m
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_ACCT=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=y
@@ -814,6 +816,7 @@ CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_SCTP=m
CONFIG_NF_CT_NETLINK=m
# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NF_CT_PROTO_UDPLITE=m
CONFIG_IP_NF_MATCH_AH=m
@@ -1002,6 +1005,7 @@ CONFIG_NET_EMATCH_META=m
CONFIG_NET_EMATCH_NBYTE=m
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
CONFIG_NET_EMATCH_U32=m
CONFIG_NET_ACT_CSUM=m
@@ -1039,6 +1043,7 @@ CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_MACVLAN=m
@@ -1297,6 +1302,7 @@ CONFIG_PCMCIA_XIRC2PS=m
CONFIG_PHYLIB=y
CONFIG_AMD_PHY=m
CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
CONFIG_CICADA_PHY=m
CONFIG_DAVICOM_PHY=m
CONFIG_DP83640_PHY=m
@@ -1513,6 +1519,7 @@ CONFIG_RT2800USB_RT35XX=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT3290=y
CONFIG_RT2800PCI_RT33XX=y
CONFIG_RT2800PCI_RT35XX=y
CONFIG_RT2800PCI_RT53XX=y
@@ -1665,6 +1672,7 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
@@ -1932,6 +1940,7 @@ CONFIG_TOUCHSCREEN_AD7879_I2C=m
# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_EETI=m
CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_ELO=m
@@ -1940,6 +1949,7 @@ CONFIG_TOUCHSCREEN_GUNZE=m
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_MMS114=m
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_MCS5000=m
CONFIG_TOUCHSCREEN_MK712=m
@@ -2146,6 +2156,7 @@ CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_HDAPS=m
+# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_I5K_AMB is not set
# FIXME: IBMAEM x86 only?
CONFIG_SENSORS_IBMAEM=m
@@ -2999,6 +3010,7 @@ CONFIG_HID=y
CONFIG_HID_BATTERY_STRENGTH=y
# debugging default is y upstream now
CONFIG_HIDRAW=y
+CONFIG_UHID=m
CONFIG_HID_PID=y
CONFIG_LOGITECH_FF=y
CONFIG_HID_LOGITECH_DJ=m
@@ -3050,6 +3062,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
CONFIG_HID_ROCCAT_ARVO=m
CONFIG_HID_ROCCAT_ISKU=m
CONFIG_HID_ROCCAT_KOVAPLUS=m
@@ -3374,6 +3387,8 @@ CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_TPS65217 is not set
# CONFIG_MFD_LM3533 is not set
# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_ARIZONA is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
#
# File systems
@@ -4001,6 +4016,7 @@ CONFIG_LEDS_DELL_NETBOOKS=m
# CONFIG_LEDS_OT200 is not set
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
@@ -4010,6 +4026,8 @@ CONFIG_LEDS_ALIX2=m
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3556=m
+CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
@@ -4253,6 +4271,7 @@ CONFIG_ALTERA_STAPL=m
# CONFIG_USB_WPAN_HCD is not set
# CONFIG_WIMAX_GDM72XX is not set
# CONFIG_IPACK_BUS is not set
+# CONFIG_CSR_WIFI is not set
#
# END OF STAGING
@@ -4269,6 +4288,7 @@ CONFIG_IMA_AUDIT=y
CONFIG_IMA_LSM_RULES=y
# CONFIG_EVM is not set
+# CONFIG_PWM is not set
CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -4344,6 +4364,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_VX855 is not set
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_SX150X is not set
@@ -4353,6 +4374,8 @@ CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_TEST_KSTRTOX=y
# CONFIG_XZ_DEC_TEST is not set
+# CONFIG_POWER_AVS is not set
+
CONFIG_TARGET_CORE=m
CONFIG_ISCSI_TARGET=m
CONFIG_LOOPBACK_TARGET=m
@@ -4366,6 +4389,9 @@ CONFIG_HWSPINLOCK=m
CONFIG_PSTORE=y
CONFIG_PSTORE_RAM=m
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+
# CONFIG_AVERAGE is not set
@@ -4377,6 +4403,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
# CONFIG_BCMA_DEBUG is not set
# CONFIG_GOOGLE_FIRMWARE is not set
diff --git a/config-nodebug b/config-nodebug
index 485f1b0..226d3db 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -111,3 +111,4 @@ CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
# CONFIG_DEBUG_KMEMLEAK_TEST is not set
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_MAC80211_MESSAGE_TRACING=y
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 05f2a93..e6c2ebd 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -186,6 +186,7 @@ CONFIG_EDAC_MM_EDAC=m
CONFIG_EDAC_PASEMI=m
CONFIG_EDAC_AMD8131=m
CONFIG_EDAC_AMD8111=m
+CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_AXON_RAM is not set
# CONFIG_OPROFILE_CELL is not set
@@ -374,3 +375,4 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_MDIO_BUS_MUX_GPIO is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_FAIL_IOMMU is not set
diff --git a/config-sparc64-generic b/config-sparc64-generic
index 44e5699..ebc891d 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -200,3 +200,4 @@ CONFIG_CRYPTO_DEV_NIAGARA2=y
CONFIG_BPF_JIT=y
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 70e872a..b1a0499 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -155,8 +155,6 @@ CONFIG_OLPC_XO1_SCI=y
# staging
# CONFIG_FB_OLPC_DCON is not set
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-
# CONFIG_SPARSE_IRQ is not set
CONFIG_RCU_FANOUT=32
diff --git a/config-x86-generic b/config-x86-generic
index 7f62aa8..ad22edd 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -172,6 +172,7 @@ CONFIG_EDAC_R82600=m
CONFIG_EDAC_X38=m
CONFIG_EDAC_MCE_INJ=m
CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_LEGACY_SYSFS=y
CONFIG_SCHED_MC=y
@@ -318,6 +319,7 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_NO_BOOTMEM is not set
# CONFIG_MEMTEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
CONFIG_MAXSMP=y
@@ -383,6 +385,8 @@ CONFIG_VIDEO_VIA_CAMERA=m
CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_X86_RESERVE_LOW=64
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+
CONFIG_PCH_GBE=m
CONFIG_PCH_PHUB=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 6df21fe..342b862 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_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
@@ -86,6 +88,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=128
# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
CONFIG_XEN_DEV_EVTCHN=m
CONFIG_XEN_SYS_HYPERVISOR=y
+# CONFIG_XEN_MCE_LOG is not set
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
diff --git a/kernel.spec b/kernel.spec
index b2a7cca..8227a47 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2284,6 +2284,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jul 30 2012 Josh Boyer <jwboyer at redhat.com> - 3.6.0-0.rc0.git5.2
+- Update config options
+
* Mon Jul 30 2012 Josh Boyer <jwboyer at redhat.com> - 3.6.0-0.rc0.git5.1
- Linux v3.5-7815-g37cd960
More information about the scm-commits
mailing list