Home| summaryrefslogtreecommitdiff |
| author | Michal Marek <mmarek@suse.cz> | 2012-07-03 06:02:09 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-07-03 06:02:09 (GMT) |
| commit | 5a2d0acb51c848f78dd8b91fac57881cd24e0bfb (patch) (side-by-side diff) | |
| tree | cd6c2c768bdfadb4f76411af9e56b9bc03282111 | |
| parent | b9e981bed1216184b74567f5e034a33ce06319eb (diff) | |
Automatically updated to 3.5-rc5-next-20120703
| -rw-r--r-- | config/i386/vanilla | 27 | ||||
| -rw-r--r-- | config/x86_64/vanilla | 27 | ||||
| -rw-r--r-- | rpm/config.sh | 2 |
3 files changed, 33 insertions, 23 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla index d599f95..63b3c87 100644 --- a/config/i386/vanilla +++ b/config/i386/vanilla @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.5.0-rc4 Kernel Configuration +# Linux/i386 3.5.0-rc5 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -135,11 +135,11 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set -# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set -CONFIG_CGROUP_HUGETLB_RES_CTLR=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y +CONFIG_CGROUP_HUGETLB=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -3502,6 +3502,7 @@ CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -4745,11 +4746,18 @@ CONFIG_AC97_BUS=m CONFIG_HID=m CONFIG_HIDRAW=y CONFIG_UHID=m -CONFIG_HID_GENERIC=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y # # Special HID drivers # +CONFIG_HID_GENERIC=m CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y @@ -4822,9 +4830,6 @@ CONFIG_HID_ZYDACRON=m # # USB HID support # -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y @@ -5106,7 +5111,6 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=m CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -5978,6 +5982,7 @@ CONFIG_DEBUG_RODATA=y CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y +CONFIG_DEBUG_TLBFLUSH=y # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla index 9962582..42987dd 100644 --- a/config/x86_64/vanilla +++ b/config/x86_64/vanilla @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.5.0-rc4 Kernel Configuration +# Linux/x86_64 3.5.0-rc5 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -136,11 +136,11 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set -# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set -CONFIG_CGROUP_HUGETLB_RES_CTLR=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y +CONFIG_CGROUP_HUGETLB=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -3334,6 +3334,7 @@ CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -4529,11 +4530,18 @@ CONFIG_HID=y # CONFIG_HID_BATTERY_STRENGTH is not set CONFIG_HIDRAW=y CONFIG_UHID=m -CONFIG_HID_GENERIC=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y # # Special HID drivers # +CONFIG_HID_GENERIC=m CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y @@ -4606,9 +4614,6 @@ CONFIG_HID_ZYDACRON=m # # USB HID support # -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y @@ -4891,7 +4896,6 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=m CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -5760,6 +5764,7 @@ CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set +CONFIG_DEBUG_TLBFLUSH=y # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y diff --git a/rpm/config.sh b/rpm/config.sh index 90b3b5e..b21ded4 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.5-rc4-next-20120629 +SRCVERSION=3.5-rc5-next-20120703 # variant of the kernel-source package, either empty or "-rt" VARIANT= # Set to 1 if the tree does not contain any non-vanilla patches at all |