| summaryrefslogtreecommitdiff |
| author | Michal Marek <mmarek@suse.cz> | 2013-05-21 09:22:28 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-05-21 09:22:28 (GMT) |
| commit | b757a659016d18684bf053cc40863672c26cea68 (patch) (side-by-side diff) | |
| tree | 7189719020e358f0b3507642f535396fae772794 | |
| parent | f45fe721b9047f817b8c89ddc9b68ff06449bf32 (diff) | |
Automatically updated to 3.10-rc2-next-20130521linux-next
| -rw-r--r-- | config/i386/vanilla | 14 | ||||
| -rw-r--r-- | config/x86_64/vanilla | 14 | ||||
| -rw-r--r-- | rpm/config.sh | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla index b7030dd..9c2c332 100644 --- a/config/i386/vanilla +++ b/config/i386/vanilla @@ -1,9 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.10.0-rc1 Kernel Configuration +# Linux/i386 3.10.0-rc2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf32-i386" @@ -660,12 +660,16 @@ CONFIG_HT_IRQ=y CONFIG_PCI_ATS=y CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_IOAPIC=y CONFIG_PCI_LABEL=y + +# +# PCI host controller drivers +# CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set CONFIG_SCx200=m CONFIG_SCx200HR_TIMER=m CONFIG_OLPC=y @@ -1245,12 +1249,13 @@ CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y CONFIG_NETPRIO_CGROUP=m CONFIG_BQL=y +CONFIG_NET_FLOW_LIMIT=y # # Network testing # CONFIG_NET_PKTGEN=m CONFIG_NET_TCPPROBE=m @@ -3752,13 +3757,12 @@ CONFIG_VIDEOBUF_VMALLOC=m CONFIG_VIDEOBUF_DMA_CONTIG=m CONFIG_VIDEOBUF_DVB=m CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEO_V4L2_INT_DEVICE=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 CONFIG_DVB_DYNAMIC_MINORS=y @@ -4921,12 +4925,13 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FUSBH200_HCD=m CONFIG_USB_OHCI_HCD=m # CONFIG_USB_OHCI_HCD_SSB is not set CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y @@ -4977,13 +4982,12 @@ CONFIG_USB_STORAGE_ENE_UB6250=m # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m # CONFIG_USB_DWC3 is not set CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_DEBUG=y # # USB port drivers # CONFIG_USB_USS720=m @@ -5476,15 +5480,15 @@ CONFIG_IIO_PERIODIC_RTC_TRIGGER=m CONFIG_IIO_GPIO_TRIGGER=m CONFIG_IIO_SYSFS_TRIGGER=m CONFIG_IIO_DUMMY_EVGEN=m CONFIG_IIO_SIMPLE_DUMMY=m CONFIG_IIO_SIMPLE_DUMMY_EVENTS=y CONFIG_IIO_SIMPLE_DUMMY_BUFFER=y +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_CXT1E1=m CONFIG_SBE_PMCC4_NCOMM=y @@ -5525,13 +5529,12 @@ CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -CONFIG_SOLO6X10=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_IMON=m CONFIG_LIRC_PARALLEL=m CONFIG_LIRC_SASEM=m @@ -5563,12 +5566,13 @@ CONFIG_ZCACHE=y CONFIG_ZCACHE_DEBUG=y CONFIG_USB_DWC2=m CONFIG_USB_DWC2_DEBUG=y CONFIG_USB_DWC2_VERBOSE=y CONFIG_USB_DWC2_TRACK_MISSED_SOFS=y CONFIG_USB_DWC2_DEBUG_PERIODIC=y +CONFIG_USB_BTMTK=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla index 4d5c715..1e9e269 100644 --- a/config/x86_64/vanilla +++ b/config/x86_64/vanilla @@ -1,9 +1,9 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.10.0-rc1 Kernel Configuration +# Linux/x86_64 3.10.0-rc2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" @@ -637,12 +637,16 @@ CONFIG_HT_IRQ=y CONFIG_PCI_ATS=y CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_IOAPIC=y CONFIG_PCI_LABEL=y + +# +# PCI host controller drivers +# CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y CONFIG_CARDBUS=y @@ -1211,12 +1215,13 @@ CONFIG_NETLINK_DIAG=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y CONFIG_NETPRIO_CGROUP=m CONFIG_BQL=y CONFIG_BPF_JIT=y +CONFIG_NET_FLOW_LIMIT=y # # Network testing # CONFIG_NET_PKTGEN=m CONFIG_NET_TCPPROBE=m @@ -3629,13 +3634,12 @@ CONFIG_VIDEOBUF_VMALLOC=m CONFIG_VIDEOBUF_DMA_CONTIG=m CONFIG_VIDEOBUF_DVB=m CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEO_V4L2_INT_DEVICE=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 CONFIG_DVB_DYNAMIC_MINORS=y @@ -4728,12 +4732,13 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FUSBH200_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y @@ -4784,13 +4789,12 @@ CONFIG_USB_STORAGE_ENE_UB6250=m # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m # CONFIG_USB_DWC3 is not set CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_DEBUG=y # # USB port drivers # CONFIG_USB_USS720=m @@ -5201,15 +5205,15 @@ CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_CXT1E1=m CONFIG_SBE_PMCC4_NCOMM=y @@ -5250,13 +5254,12 @@ CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -CONFIG_SOLO6X10=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m CONFIG_LIRC_IMON=m CONFIG_LIRC_PARALLEL=m CONFIG_LIRC_SASEM=m @@ -5288,12 +5291,13 @@ CONFIG_ZCACHE=y CONFIG_ZCACHE_DEBUG=y CONFIG_USB_DWC2=m CONFIG_USB_DWC2_DEBUG=y CONFIG_USB_DWC2_VERBOSE=y CONFIG_USB_DWC2_TRACK_MISSED_SOFS=y CONFIG_USB_DWC2_DEBUG_PERIODIC=y +CONFIG_USB_BTMTK=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m diff --git a/rpm/config.sh b/rpm/config.sh index 32df662..b35b683 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,8 +1,8 @@ # The version of the main tarball to use -SRCVERSION=3.10-rc1-next-20130517 +SRCVERSION=3.10-rc2-next-20130521 # 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 VANILLA_ONLY=1 # buildservice projects to build the kernel against OBS_PROJECT=openSUSE:12.3:Update |