From: Seth Forshee <seth.forshee@canonical.com>
Date: Fri, 23 Feb 2018 14:26:02 +0000 (-0600)
Subject: UBUNTU: updateconfigs after v4.14.4 stable updates
X-Git-Tag: Ubuntu-4.15.0-11.12~179
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=52530582ba2d0662be0efc8d7a675926f9980d94;p=mirror_ubuntu-bionic-kernel.git

UBUNTU: updateconfigs after v4.14.4 stable updates

BugLink: http://bugs.launchpad.net/bugs/1751064
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 84b117bc0312..336324964e3e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -816,6 +816,8 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 CONFIG_B43LEGACY_HWRNG=y
 CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 CONFIG_B43LEGACY_PIO=y
 # CONFIG_B43LEGACY_PIO_MODE is not set
 CONFIG_B43_BCMA=y
@@ -826,6 +828,8 @@ CONFIG_B43_BUSES_BCMA_AND_SSB=y
 # CONFIG_B43_DEBUG is not set
 CONFIG_B43_HWRNG=y
 CONFIG_B43_LEDS=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PHY_G=y
 CONFIG_B43_PHY_HT=y
 CONFIG_B43_PHY_LP=y
@@ -834,6 +838,9 @@ CONFIG_B43_PIO=y
 # CONFIG_B43_SDIO is not set
 CONFIG_B43_SSB=y
 CONFIG_B44=m
+CONFIG_B44_PCI=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_B53=m
 CONFIG_B53_MDIO_DRIVER=m
 CONFIG_B53_MMAP_DRIVER=m
@@ -3302,6 +3309,7 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_HAPPYMEAL=m
 CONFIG_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HARDLOCKUP_DETECTOR=y
@@ -8845,15 +8853,21 @@ CONFIG_SRAM_EXEC=y
 CONFIG_SRCU=y
 CONFIG_SRF04=m
 CONFIG_SRF08=m
+CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_BLOCKIO=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 # CONFIG_SSB_SILENT is not set
+CONFIG_SSB_SPROM=y
 CONFIG_SSFDC=m
 CONFIG_SSI_PROTOCOL=m
 CONFIG_STACKTRACE=y
@@ -9390,6 +9404,7 @@ CONFIG_UNISYS_VISORNIC=m
 CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=m
+CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set