Author: arekm Date: Thu Nov 17 18:25:03 2011 GMT Module: packages Tag: HEAD ---- Log message: - vserver up to patch-3.1.1-vs2.3.2.diff
---- Files affected: packages/kernel: kernel.spec (1.998 -> 1.999) , kernel-vserver-2.3.patch (1.85 -> 1.86) ---- Diffs: ================================================================ Index: packages/kernel/kernel.spec diff -u packages/kernel/kernel.spec:1.998 packages/kernel/kernel.spec:1.999 --- packages/kernel/kernel.spec:1.998 Fri Nov 11 23:15:13 2011 +++ packages/kernel/kernel.spec Thu Nov 17 19:24:57 2011 @@ -226,7 +226,7 @@ # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -# http://vserver.13thfloor.at/Experimental/patch-3.1-vs2.3.1-rc2.diff +# http://vserver.13thfloor.at/Experimental/patch-3.1.1-vs2.3.2.diff Patch100: kernel-vserver-2.3.patch Patch101: kernel-vserver-fixes.patch @@ -1502,6 +1502,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.999 2011/11/17 18:24:57 arekm +- vserver up to patch-3.1.1-vs2.3.2.diff + Revision 1.998 2011/11/11 22:15:13 arekm - up to 3.1.1 ================================================================ Index: packages/kernel/kernel-vserver-2.3.patch diff -u packages/kernel/kernel-vserver-2.3.patch:1.85 packages/kernel/kernel-vserver-2.3.patch:1.86 --- packages/kernel/kernel-vserver-2.3.patch:1.85 Fri Nov 11 23:15:13 2011 +++ packages/kernel/kernel-vserver-2.3.patch Thu Nov 17 19:24:57 2011 @@ -1,1630 +1,6 @@ -diff -NurpP --minimal linux-3.1/.config.inet linux-3.1-vs2.3.1-rc2/.config.inet ---- linux-3.1/.config.inet 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.1-vs2.3.1-rc2/.config.inet 2011-10-24 18:53:33.000000000 +0200 -@@ -0,0 +1,1620 @@ -+# -+# Automatically generated make config: don't edit -+# Linux/x86_64 3.0.0-rc2-vs2.3.x Kernel Configuration -+# -+CONFIG_64BIT=y -+# CONFIG_X86_32 is not set -+CONFIG_X86_64=y -+CONFIG_X86=y -+CONFIG_INSTRUCTION_DECODER=y -+CONFIG_OUTPUT_FORMAT="elf64-x86-64" -+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -+CONFIG_GENERIC_CMOS_UPDATE=y -+CONFIG_CLOCKSOURCE_WATCHDOG=y -+CONFIG_GENERIC_CLOCKEVENTS=y -+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -+CONFIG_LOCKDEP_SUPPORT=y -+CONFIG_STACKTRACE_SUPPORT=y -+CONFIG_HAVE_LATENCYTOP_SUPPORT=y -+CONFIG_MMU=y -+CONFIG_ZONE_DMA=y -+CONFIG_NEED_DMA_MAP_STATE=y -+CONFIG_NEED_SG_DMA_LENGTH=y -+CONFIG_GENERIC_ISA_DMA=y -+CONFIG_GENERIC_IOMAP=y -+CONFIG_GENERIC_BUG=y -+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -+CONFIG_GENERIC_HWEIGHT=y -+CONFIG_ARCH_MAY_HAVE_PC_FDC=y -+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -+CONFIG_RWSEM_XCHGADD_ALGORITHM=y -+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y -+CONFIG_GENERIC_CALIBRATE_DELAY=y -+CONFIG_GENERIC_TIME_VSYSCALL=y -+CONFIG_ARCH_HAS_CPU_RELAX=y -+CONFIG_ARCH_HAS_DEFAULT_IDLE=y -+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -+CONFIG_HAVE_SETUP_PER_CPU_AREA=y -+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y -+CONFIG_ARCH_HIBERNATION_POSSIBLE=y -+CONFIG_ARCH_SUSPEND_POSSIBLE=y -+CONFIG_ZONE_DMA32=y -+CONFIG_ARCH_POPULATES_NODE_MAP=y -+CONFIG_AUDIT_ARCH=y -+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -+CONFIG_X86_64_SMP=y -+CONFIG_X86_HT=y -+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" -+# CONFIG_KTIME_SCALAR is not set -+CONFIG_ARCH_CPU_PROBE_RELEASE=y -+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -+CONFIG_CONSTRUCTORS=y -+CONFIG_HAVE_IRQ_WORK=y -+CONFIG_IRQ_WORK=y -+ -+# -+# General setup -+# -+CONFIG_EXPERIMENTAL=y -+CONFIG_INIT_ENV_ARG_LIMIT=32 -+CONFIG_CROSS_COMPILE="" -+CONFIG_LOCALVERSION="" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_HAVE_KERNEL_GZIP=y -+CONFIG_HAVE_KERNEL_BZIP2=y -+CONFIG_HAVE_KERNEL_LZMA=y -+CONFIG_HAVE_KERNEL_XZ=y -+CONFIG_HAVE_KERNEL_LZO=y -+# CONFIG_KERNEL_GZIP is not set -+# CONFIG_KERNEL_BZIP2 is not set -+CONFIG_KERNEL_LZMA=y -+# CONFIG_KERNEL_XZ is not set -+# CONFIG_KERNEL_LZO is not set -+CONFIG_SWAP=y -+CONFIG_SYSVIPC=y -+CONFIG_SYSVIPC_SYSCTL=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_POSIX_MQUEUE_SYSCTL=y -+CONFIG_BSD_PROCESS_ACCT=y -+# CONFIG_BSD_PROCESS_ACCT_V3 is not set -+# CONFIG_FHANDLE is not set -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+# CONFIG_AUDIT is not set -+CONFIG_HAVE_GENERIC_HARDIRQS=y -+ -+# -+# IRQ subsystem -+# -+CONFIG_GENERIC_HARDIRQS=y -+CONFIG_HAVE_SPARSE_IRQ=y -+CONFIG_GENERIC_IRQ_PROBE=y -+CONFIG_GENERIC_IRQ_SHOW=y -+CONFIG_GENERIC_PENDING_IRQ=y -+CONFIG_IRQ_FORCED_THREADING=y -+# CONFIG_SPARSE_IRQ is not set -+ -+# -+# RCU Subsystem -+# -+CONFIG_TREE_RCU=y -+# CONFIG_PREEMPT_RCU is not set -+# CONFIG_RCU_TRACE is not set -+CONFIG_RCU_FANOUT=64 -+# CONFIG_RCU_FANOUT_EXACT is not set -+# CONFIG_TREE_RCU_TRACE is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_LOG_BUF_SHIFT=18 -+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -+CONFIG_CGROUPS=y -+# CONFIG_CGROUP_DEBUG is not set -+# CONFIG_CGROUP_FREEZER is not set -+# CONFIG_CGROUP_DEVICE is not set -+# CONFIG_CPUSETS is not set -+# CONFIG_CGROUP_CPUACCT is not set -+CONFIG_RESOURCE_COUNTERS=y -+CONFIG_CGROUP_MEM_RES_CTLR=y -+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y -+# CONFIG_CGROUP_PERF is not set -+CONFIG_CGROUP_SCHED=y -+CONFIG_FAIR_GROUP_SCHED=y -+# CONFIG_RT_GROUP_SCHED is not set -+# CONFIG_BLK_CGROUP is not set -+CONFIG_NAMESPACES=y -+CONFIG_UTS_NS=y -+CONFIG_IPC_NS=y -+CONFIG_USER_NS=y -+# CONFIG_PID_NS is not set -+# CONFIG_NET_NS is not set -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_MM_OWNER=y -+# CONFIG_SYSFS_DEPRECATED is not set -+# CONFIG_RELAY is not set -+# CONFIG_BLK_DEV_INITRD is not set -+CONFIG_CC_OPTIMIZE_FOR_SIZE=y -+CONFIG_SYSCTL=y -+CONFIG_ANON_INODES=y -+CONFIG_EXPERT=y -+CONFIG_UID16=y -+CONFIG_SYSCTL_SYSCALL=y -+CONFIG_KALLSYMS=y -+CONFIG_KALLSYMS_ALL=y -+CONFIG_HOTPLUG=y -+CONFIG_PRINTK=y -+CONFIG_BUG=y -+CONFIG_ELF_CORE=y -+CONFIG_PCSPKR_PLATFORM=y -+CONFIG_BASE_FULL=y -+CONFIG_FUTEX=y -+CONFIG_EPOLL=y -+CONFIG_SIGNALFD=y -+CONFIG_TIMERFD=y -+CONFIG_EVENTFD=y -+CONFIG_SHMEM=y -+CONFIG_AIO=y -+# CONFIG_EMBEDDED is not set -+CONFIG_HAVE_PERF_EVENTS=y -+ -+# -+# Kernel Performance Events And Counters -+# -+CONFIG_PERF_EVENTS=y -+# CONFIG_PERF_COUNTERS is not set -+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -+CONFIG_VM_EVENT_COUNTERS=y -+CONFIG_PCI_QUIRKS=y -+CONFIG_SLUB_DEBUG=y -+# CONFIG_COMPAT_BRK is not set -+# CONFIG_SLAB is not set -+CONFIG_SLUB=y -+# CONFIG_SLOB is not set -+# CONFIG_PROFILING is not set -+CONFIG_HAVE_OPROFILE=y -+# CONFIG_JUMP_LABEL is not set -+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -+CONFIG_HAVE_IOREMAP_PROT=y -+CONFIG_HAVE_KPROBES=y -+CONFIG_HAVE_KRETPROBES=y -+CONFIG_HAVE_OPTPROBES=y -+CONFIG_HAVE_ARCH_TRACEHOOK=y -+CONFIG_HAVE_DMA_ATTRS=y -+CONFIG_USE_GENERIC_SMP_HELPERS=y -+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -+CONFIG_HAVE_DMA_API_DEBUG=y -+CONFIG_HAVE_HW_BREAKPOINT=y -+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -+CONFIG_HAVE_USER_RETURN_NOTIFIER=y -+CONFIG_HAVE_PERF_EVENTS_NMI=y -+CONFIG_HAVE_ARCH_JUMP_LABEL=y -+ -+# -+# GCOV-based kernel profiling -+# -+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -+CONFIG_SLABINFO=y -+CONFIG_RT_MUTEXES=y -+CONFIG_BASE_SMALL=0 -+# CONFIG_MODULES is not set -+CONFIG_STOP_MACHINE=y -+CONFIG_BLOCK=y -+# CONFIG_BLK_DEV_BSG is not set -+# CONFIG_BLK_DEV_INTEGRITY is not set -+CONFIG_BLOCK_COMPAT=y -+ -+# -+# IO Schedulers -+# -+CONFIG_IOSCHED_NOOP=y -+# CONFIG_IOSCHED_DEADLINE is not set -+CONFIG_IOSCHED_CFQ=y -+CONFIG_DEFAULT_CFQ=y -+# CONFIG_DEFAULT_NOOP is not set -+CONFIG_DEFAULT_IOSCHED="cfq" -+# CONFIG_INLINE_SPIN_TRYLOCK is not set -+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK is not set -+# CONFIG_INLINE_SPIN_LOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -+CONFIG_INLINE_SPIN_UNLOCK=y -+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_READ_TRYLOCK is not set -+# CONFIG_INLINE_READ_LOCK is not set -+# CONFIG_INLINE_READ_LOCK_BH is not set -+# CONFIG_INLINE_READ_LOCK_IRQ is not set -+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -+CONFIG_INLINE_READ_UNLOCK=y -+# CONFIG_INLINE_READ_UNLOCK_BH is not set -+CONFIG_INLINE_READ_UNLOCK_IRQ=y -+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_WRITE_TRYLOCK is not set -+# CONFIG_INLINE_WRITE_LOCK is not set -+# CONFIG_INLINE_WRITE_LOCK_BH is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -+CONFIG_INLINE_WRITE_UNLOCK=y -+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -+CONFIG_MUTEX_SPIN_ON_OWNER=y -+CONFIG_FREEZER=y -+ -+# -+# Processor type and features -+# -+CONFIG_TICK_ONESHOT=y -+# CONFIG_NO_HZ is not set -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -+CONFIG_SMP=y -+CONFIG_X86_MPPARSE=y -+# CONFIG_X86_EXTENDED_PLATFORM is not set -+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -+CONFIG_SCHED_OMIT_FRAME_POINTER=y -+# CONFIG_PARAVIRT_GUEST is not set -+CONFIG_NO_BOOTMEM=y -+# CONFIG_MEMTEST is not set -+# CONFIG_MK8 is not set -+# CONFIG_MPSC is not set -+CONFIG_MCORE2=y -+# CONFIG_MATOM is not set -+# CONFIG_GENERIC_CPU is not set -+CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -+CONFIG_X86_CMPXCHG=y -+CONFIG_CMPXCHG_LOCAL=y -+CONFIG_X86_L1_CACHE_SHIFT=6 -+CONFIG_X86_XADD=y -+CONFIG_X86_WP_WORKS_OK=y -+CONFIG_X86_INTEL_USERCOPY=y -+CONFIG_X86_USE_PPRO_CHECKSUM=y -+CONFIG_X86_P6_NOP=y -+CONFIG_X86_TSC=y -+CONFIG_X86_CMPXCHG64=y -+CONFIG_X86_CMOV=y -+CONFIG_X86_MINIMUM_CPU_FAMILY=64 -+CONFIG_X86_DEBUGCTLMSR=y -+# CONFIG_PROCESSOR_SELECT is not set -+CONFIG_CPU_SUP_INTEL=y -+CONFIG_CPU_SUP_AMD=y -+CONFIG_CPU_SUP_CENTAUR=y -+CONFIG_HPET_TIMER=y -+CONFIG_HPET_EMULATE_RTC=y -+CONFIG_DMI=y -+CONFIG_GART_IOMMU=y -+# CONFIG_CALGARY_IOMMU is not set -+# CONFIG_AMD_IOMMU is not set -+CONFIG_SWIOTLB=y -+CONFIG_IOMMU_HELPER=y -+# CONFIG_IOMMU_API is not set -+# CONFIG_MAXSMP is not set -+CONFIG_NR_CPUS=32 -+CONFIG_SCHED_SMT=y -+CONFIG_SCHED_MC=y -+# CONFIG_IRQ_TIME_ACCOUNTING is not set -+CONFIG_PREEMPT_NONE=y -+# CONFIG_PREEMPT_VOLUNTARY is not set -+# CONFIG_PREEMPT is not set -+CONFIG_X86_LOCAL_APIC=y -+CONFIG_X86_IO_APIC=y -+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set -+CONFIG_X86_MCE=y -+CONFIG_X86_MCE_INTEL=y -+CONFIG_X86_MCE_AMD=y -+CONFIG_X86_MCE_THRESHOLD=y -+# CONFIG_X86_MCE_INJECT is not set -+CONFIG_X86_THERMAL_VECTOR=y -+# CONFIG_I8K is not set -+# CONFIG_MICROCODE is not set -+CONFIG_X86_MSR=y -+CONFIG_X86_CPUID=y -+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -+CONFIG_ARCH_DMA_ADDR_T_64BIT=y -+CONFIG_DIRECT_GBPAGES=y -+# CONFIG_NUMA is not set -+CONFIG_ARCH_SPARSEMEM_ENABLE=y -+CONFIG_ARCH_SPARSEMEM_DEFAULT=y -+CONFIG_ARCH_SELECT_MEMORY_MODEL=y -+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -+CONFIG_SELECT_MEMORY_MODEL=y -+CONFIG_SPARSEMEM_MANUAL=y -+CONFIG_SPARSEMEM=y -+CONFIG_HAVE_MEMORY_PRESENT=y -+CONFIG_SPARSEMEM_EXTREME=y -+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y -+CONFIG_SPARSEMEM_VMEMMAP=y -+CONFIG_HAVE_MEMBLOCK=y -+# CONFIG_MEMORY_HOTPLUG is not set -+CONFIG_PAGEFLAGS_EXTENDED=y -+CONFIG_SPLIT_PTLOCK_CPUS=4 -+CONFIG_COMPACTION=y -+CONFIG_MIGRATION=y -+CONFIG_PHYS_ADDR_T_64BIT=y -+CONFIG_ZONE_DMA_FLAG=1 -+CONFIG_BOUNCE=y -+CONFIG_VIRT_TO_BUS=y -+# CONFIG_KSM is not set -+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -+# CONFIG_MEMORY_FAILURE is not set -+CONFIG_TRANSPARENT_HUGEPAGE=y -+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -+CONFIG_CLEANCACHE=y -+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set -+CONFIG_X86_RESERVE_LOW=4 -+CONFIG_MTRR=y -+CONFIG_MTRR_SANITIZER=y -+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 -+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -+CONFIG_X86_PAT=y -+CONFIG_ARCH_USES_PG_UNCACHED=y -+# CONFIG_EFI is not set -+CONFIG_SECCOMP=y -+# CONFIG_CC_STACKPROTECTOR is not set -+CONFIG_HZ_100=y -+# CONFIG_HZ_250 is not set -+# CONFIG_HZ_300 is not set -+# CONFIG_HZ_1000 is not set -+CONFIG_HZ=100 -+CONFIG_SCHED_HRTICK=y -+# CONFIG_KEXEC is not set -+# CONFIG_CRASH_DUMP is not set -+CONFIG_PHYSICAL_START=0x1000000 -+# CONFIG_RELOCATABLE is not set -+CONFIG_PHYSICAL_ALIGN=0x1000000 -+CONFIG_HOTPLUG_CPU=y -+# CONFIG_COMPAT_VDSO is not set -+# CONFIG_CMDLINE_BOOL is not set -+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -+ -+# -+# Power management and ACPI options -+# -+CONFIG_SUSPEND=y -+CONFIG_SUSPEND_FREEZER=y -+# CONFIG_HIBERNATION is not set -+CONFIG_PM_SLEEP=y -+CONFIG_PM_SLEEP_SMP=y -+# CONFIG_PM_RUNTIME is not set -+CONFIG_PM=y -+# CONFIG_PM_DEBUG is not set -+CONFIG_ACPI=y -+CONFIG_ACPI_SLEEP=y -+# CONFIG_ACPI_PROCFS is not set -+# CONFIG_ACPI_PROCFS_POWER is not set -+# CONFIG_ACPI_EC_DEBUGFS is not set -+CONFIG_ACPI_PROC_EVENT=y -+CONFIG_ACPI_AC=y -+CONFIG_ACPI_BATTERY=y -+CONFIG_ACPI_BUTTON=y -+CONFIG_ACPI_FAN=y -+# CONFIG_ACPI_DOCK is not set -+CONFIG_ACPI_PROCESSOR=y -+CONFIG_ACPI_HOTPLUG_CPU=y -+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set -+CONFIG_ACPI_THERMAL=y -+# CONFIG_ACPI_CUSTOM_DSDT is not set -+CONFIG_ACPI_BLACKLIST_YEAR=0 -+# CONFIG_ACPI_DEBUG is not set -+# CONFIG_ACPI_PCI_SLOT is not set -+CONFIG_X86_PM_TIMER=y -+CONFIG_ACPI_CONTAINER=y -+# CONFIG_ACPI_SBS is not set -+# CONFIG_ACPI_HED is not set -+# CONFIG_ACPI_APEI is not set -+# CONFIG_SFI is not set -+ -+# -+# CPU Frequency scaling -+# -+# CONFIG_CPU_FREQ is not set -+CONFIG_CPU_IDLE=y -+CONFIG_CPU_IDLE_GOV_LADDER=y -+# CONFIG_INTEL_IDLE is not set -+ -+# -+# Memory power savings -+# -+# CONFIG_I7300_IDLE is not set -+ -+# -+# Bus options (PCI etc.) -+# -+CONFIG_PCI=y -+CONFIG_PCI_DIRECT=y -+# CONFIG_PCI_MMCONFIG is not set -+CONFIG_PCI_DOMAINS=y -+# CONFIG_PCI_CNB20LE_QUIRK is not set -+CONFIG_PCIEPORTBUS=y -+# CONFIG_PCIEAER is not set -+CONFIG_PCIEASPM=y -+# CONFIG_PCIEASPM_DEBUG is not set -+CONFIG_ARCH_SUPPORTS_MSI=y -+# CONFIG_PCI_MSI is not set -+# CONFIG_PCI_DEBUG is not set -+# CONFIG_PCI_STUB is not set -+CONFIG_HT_IRQ=y -+# CONFIG_PCI_IOV is not set -+CONFIG_PCI_IOAPIC=y -+CONFIG_PCI_LABEL=y -+CONFIG_ISA_DMA_API=y -+CONFIG_AMD_NB=y -+# CONFIG_PCCARD is not set -+# CONFIG_HOTPLUG_PCI is not set -+# CONFIG_RAPIDIO is not set -+ -+# -+# Executable file formats / Emulations -+# -+CONFIG_BINFMT_ELF=y -+CONFIG_COMPAT_BINFMT_ELF=y -+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -+# CONFIG_HAVE_AOUT is not set -+# CONFIG_BINFMT_MISC is not set -+CONFIG_IA32_EMULATION=y -+# CONFIG_IA32_AOUT is not set -+CONFIG_COMPAT=y -+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y -+CONFIG_SYSVIPC_COMPAT=y -+CONFIG_HAVE_TEXT_POKE_SMP=y -+CONFIG_NET=y -+ -+# -+# Networking options -+# -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM=y -+CONFIG_XFRM_USER=y -+# CONFIG_XFRM_SUB_POLICY is not set -+# CONFIG_XFRM_MIGRATE is not set -+# CONFIG_XFRM_STATISTICS is not set -+CONFIG_XFRM_IPCOMP=y -+# CONFIG_NET_KEY is not set -+CONFIG_IP_MULTICAST=y -+# CONFIG_IP_ADVANCED_ROUTER is not set -+# CONFIG_IP_PNP is not set -+# CONFIG_NET_IPIP is not set -+# CONFIG_NET_IPGRE_DEMUX is not set -+# CONFIG_IP_MROUTE is not set -+# CONFIG_ARPD is not set -+CONFIG_SYN_COOKIES=y -+# CONFIG_INET_AH is not set -+# CONFIG_INET_ESP is not set -+# CONFIG_INET_IPCOMP is not set -+# CONFIG_INET_XFRM_TUNNEL is not set -+CONFIG_INET_TUNNEL=y -+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -+# CONFIG_INET_XFRM_MODE_TUNNEL is not set -+# CONFIG_INET_XFRM_MODE_BEET is not set -+CONFIG_INET_LRO=y -+CONFIG_INET_DIAG=y -+CONFIG_INET_TCP_DIAG=y -+# CONFIG_TCP_CONG_ADVANCED is not set -+CONFIG_TCP_CONG_CUBIC=y -+CONFIG_DEFAULT_TCP_CONG="cubic" -+# CONFIG_TCP_MD5SIG is not set -+CONFIG_IPV6=y -+# CONFIG_IPV6_PRIVACY is not set -+# CONFIG_IPV6_ROUTER_PREF is not set -+# CONFIG_IPV6_OPTIMISTIC_DAD is not set -+CONFIG_INET6_AH=y -+CONFIG_INET6_ESP=y -+CONFIG_INET6_IPCOMP=y -+# CONFIG_IPV6_MIP6 is not set -+CONFIG_INET6_XFRM_TUNNEL=y -+CONFIG_INET6_TUNNEL=y -+CONFIG_INET6_XFRM_MODE_TRANSPORT=y -+CONFIG_INET6_XFRM_MODE_TUNNEL=y -+CONFIG_INET6_XFRM_MODE_BEET=y -+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -+CONFIG_IPV6_SIT=y -+# CONFIG_IPV6_SIT_6RD is not set -+CONFIG_IPV6_NDISC_NODETYPE=y -+# CONFIG_IPV6_TUNNEL is not set -+# CONFIG_IPV6_MULTIPLE_TABLES is not set -+# CONFIG_IPV6_MROUTE is not set -+# CONFIG_NETWORK_SECMARK is not set -+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -+CONFIG_NETFILTER=y -+# CONFIG_NETFILTER_DEBUG is not set -+# CONFIG_NETFILTER_ADVANCED is not set -+ -+# -+# Core Netfilter Configuration -+# -+CONFIG_NETFILTER_NETLINK=y -+CONFIG_NETFILTER_NETLINK_LOG=y -+CONFIG_NF_CONNTRACK=y -+CONFIG_NF_CONNTRACK_FTP=y -+CONFIG_NF_CONNTRACK_IRC=y -+CONFIG_NF_CONNTRACK_SIP=y -+CONFIG_NF_CT_NETLINK=y -+CONFIG_NETFILTER_XTABLES=y -+ -+# -+# Xtables combined modules -+# -+CONFIG_NETFILTER_XT_MARK=y -+ -+# -+# Xtables targets -+# -+CONFIG_NETFILTER_XT_TARGET_NFLOG=y -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -+ -+# -+# Xtables matches -+# -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -+CONFIG_NETFILTER_XT_MATCH_POLICY=y -+CONFIG_NETFILTER_XT_MATCH_STATE=y -+# CONFIG_IP_SET is not set -+CONFIG_IP_VS=y <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.998&r2=1.999&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.85&r2=1.86&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
