aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-10-17 13:09:53 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:51:17 -0700
commitb9e222103312c094b3d9d6d6bac5c6538dcca05a (patch)
tree23ac5af65b7e9db4819eac996714878a45233427 /debian.master
parent31034fd283e2fc07c72cc98191a73b7d98006610 (diff)
downloadlinux-linaro-precise-b9e222103312c094b3d9d6d6bac5c6538dcca05a.tar.gz
UBUNTU: [Config] Transition -generic and -server to be identical
Given the minimal set of differences between the existing -generic and -server flavors, it's been proposed we consider merging the two. The following config changes align the -generic and -server configs to be identical. This is a transitional change to allow testing of the config changes but leave us with an easy fallback scenario (ie revert this commit) should testing prove unfavorable. Otherwise, we will proceed with merging the -generic and -server flavors into a single flavor. https://lists.ubuntu.com/archives/kernel-team/2011-October/017413.html Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/config/amd64/config.common.amd642
-rw-r--r--debian.master/config/amd64/config.flavour.generic3
-rw-r--r--debian.master/config/amd64/config.flavour.server23
-rw-r--r--debian.master/config/amd64/config.flavour.virtual3
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
7 files changed, 13 insertions, 21 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ae6c2a89428..9e20c386f59 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -203,6 +203,8 @@ CONFIG_SCSI_IPR=m
# CONFIG_SCSI_MVSAS_TASKLET is not set
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SENSORS_AK8975=m
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_PCI=y
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index a3d180890f2..7f31bf6763a 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -5,12 +5,9 @@ CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_INTEL_IDLE=y
-# CONFIG_MEMORY_HOTPLUG is not set
CONFIG_NR_CPUS=256
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_SYM53C8XX_2=m
CONFIG_VIRTIO=m
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_NET=m
diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index fa4213147d9..dcba56bcbb9 100644
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -1,21 +1,18 @@
#
# Config options for config.flavour.server automatically generated by splitconfig.pl
#
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_INTEL_IDLE=y
-CONFIG_MEMORY_HOTPLUG=y
CONFIG_NR_CPUS=256
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_RING=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_XENBUS_FRONTEND=m
diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual
index ed3931cae6e..73a3e89b1ee 100644
--- a/debian.master/config/amd64/config.flavour.virtual
+++ b/debian.master/config/amd64/config.flavour.virtual
@@ -5,12 +5,9 @@
CONFIG_DEFAULT_DEADLINE=y
CONFIG_DEFAULT_IOSCHED="deadline"
# CONFIG_INTEL_IDLE is not set
-CONFIG_MEMORY_HOTPLUG=y
CONFIG_NR_CPUS=64
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_VIRTIO=y
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_NET=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f77c76705ba..66cebe4537a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2955,6 +2955,7 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_SAS=m
# CONFIG_MELAN is not set
CONFIG_MEMORY_FAILURE=y
+CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 31e823cf66a..c6fefd3ab0a 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -117,7 +117,6 @@ CONFIG_MACH_NO_WESTBRIDGE=y
CONFIG_MANTIS_CORE=m
CONFIG_MARVELL_PHY=m
CONFIG_MAX_RAW_DEVS=256
-CONFIG_MEMORY_HOTPLUG=y
# CONFIG_MEMORY_HOTREMOVE is not set
CONFIG_MFD_JANZ_CMODIO=m
# CONFIG_MFD_TMIO is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index c9f640186d6..fd932f959cb 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -132,7 +132,6 @@ CONFIG_MANTIS_CORE=m
CONFIG_MARVELL_PHY=m
CONFIG_MAX_ACTIVE_REGIONS=256
CONFIG_MAX_RAW_DEVS=8192
-CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_MFD_JANZ_CMODIO=m
# CONFIG_MFD_TMIO is not set