[PATCH][Yakkety] UBUNTU: [Config] CONFIG_PSTORE_CONSOLE=y

[Kees Cook]

There's no down side to having the console support for pstore backends.
This makes it so people who carve out RAM so pstore can also keep their
console output across a crash in addition to the Oops.

Signed-off-by: Kees Cook <kees at ubuntu.com>
---
 debian.master/config/amd64/config.common.amd64     | 2 +-
 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 2 +-
 debian.master/config/powerpc/config.common.powerpc | 2 +-
 debian.master/config/ppc64el/config.common.ppc64el | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 3f616c4..38e9796 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -305,7 +305,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 825012f..3391b03 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7393,7 +7393,7 @@ CONFIG_JFFS2_CMODE_FAVOURLZO                    policy<{'amd64': 'y', 'arm64': '
 
 # Menu: File systems >> Miscellaneous filesystems >> Persistent store support
 CONFIG_PSTORE                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
-CONFIG_PSTORE_CONSOLE                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'y', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
+CONFIG_PSTORE_CONSOLE                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_PSTORE_PMSG                              policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 CONFIG_PSTORE_FTRACE                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 CONFIG_PSTORE_RAM                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index bdef25a..32f65f0 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -308,7 +308,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PROBE_EVENTS is not set
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 2700eb6..425af28f 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -299,7 +299,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_PWM=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 5d406fb..f5eaa8e 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -346,7 +346,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
-- 
1.9.1


-- 
Kees Cook