summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.nu>2015-02-16 11:34:10 -0600
committerMatt Housh <jaeger@crux.nu>2015-02-16 11:34:10 -0600
commitdca345b287753a6a5904dd167e01c2907b66cbbe (patch)
treeaaaafb166ba9aa42d700a39cee936890c3753331 /kernel
parent7a8bfb2bcf4ea697c968ffe5a6d9340b0d75cb52 (diff)
downloadiso-dca345b287753a6a5904dd167e01c2907b66cbbe.tar.gz
iso-dca345b287753a6a5904dd167e01c2907b66cbbe.tar.xz
Updated kernel to 3.14.33, updated notes and setup dependencies file
Diffstat (limited to 'kernel')
-rw-r--r--kernel/linux-3.14.33.config (renamed from kernel/linux-3.14.22.config)4
-rw-r--r--kernel/linux-3.14.33.defconfig (renamed from kernel/linux-3.14.22.defconfig)12
2 files changed, 10 insertions, 6 deletions
diff --git a/kernel/linux-3.14.22.config b/kernel/linux-3.14.33.config
index 0ab1ad0..69a6b4b 100644
--- a/kernel/linux-3.14.22.config
+++ b/kernel/linux-3.14.33.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.22 Kernel Configuration
+# Linux/x86 3.14.33 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -350,6 +350,7 @@ CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -563,6 +564,7 @@ CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_X86_DEV_DMA_OPS=y
+CONFIG_IOSF_MBI=m
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
diff --git a/kernel/linux-3.14.22.defconfig b/kernel/linux-3.14.33.defconfig
index e77da5c..16c652d 100644
--- a/kernel/linux-3.14.22.defconfig
+++ b/kernel/linux-3.14.33.defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.22 Kernel Configuration
+# Linux/x86 3.14.33 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -350,6 +350,7 @@ CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
+CONFIG_X86_UP_APIC_MSI=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -563,6 +564,7 @@ CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_X86_DEV_DMA_OPS=y
+CONFIG_IOSF_MBI=m
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -834,10 +836,10 @@ CONFIG_SCSI_MULTI_LUN=y
#
# SCSI Transports
#
-CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_SPI_ATTRS=y
CONFIG_SCSI_FC_ATTRS=m
CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=y
CONFIG_SCSI_SAS_LIBSAS=m
# CONFIG_SCSI_SAS_ATA is not set
CONFIG_SCSI_SAS_HOST_SMP=y
@@ -1069,9 +1071,9 @@ CONFIG_DM_UEVENT=y
# CONFIG_DM_SWITCH is not set
# CONFIG_TARGET_CORE is not set
CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
+CONFIG_FUSION_SPI=y
CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
+CONFIG_FUSION_SAS=y
CONFIG_FUSION_MAX_SGE=128
# CONFIG_FUSION_CTL is not set
# CONFIG_FUSION_LOGGING is not set

Generated by cgit