diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-01-19 16:29:42 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-01-19 16:29:42 -0500 |
| commit | 1af40db9c4ef369c0a3392d066691f41d5175065 (patch) | |
| tree | 6cbc36fe5cf11ec7a7de778b8bcf506505cdb96a /config-arm-generic | |
| parent | de0020923c9ff7245c3c5bfe78592d2ef1b8d0e7 (diff) | |
| download | kernel-1af40db9c4ef369c0a3392d066691f41d5175065.tar.gz kernel-1af40db9c4ef369c0a3392d066691f41d5175065.tar.xz kernel-1af40db9c4ef369c0a3392d066691f41d5175065.zip | |
Rebase to 4.3.y
- Backport nouveau stable fixes (rhbz 1299349)
- CVE-2016-0728 Keys: reference leak in join_session_keyring (rhbz 1296623 1297475)
- Add currently queued networking stable patches
- Add a couple btrfs patches cc'd to stable upstream
- Add SCSI patches to avoid blacklist false positives (rhbz 1299810)
Diffstat (limited to 'config-arm-generic')
| -rw-r--r-- | config-arm-generic | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/config-arm-generic b/config-arm-generic index 12c9168da..c8984594e 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -40,6 +40,8 @@ CONFIG_FB_SIMPLE=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_ARM_PMU=y + # ARM AMBA generic HW CONFIG_ARM_AMBA=y CONFIG_KERNEL_MODE_NEON=y @@ -64,6 +66,17 @@ CONFIG_RTC_DRV_PL031=y CONFIG_PL330_DMA=m CONFIG_GPIO_PL061=y CONFIG_USB_ISP1760=m +CONFIG_ARM_PL172_MPMC=m + +# HW crypto and rng +CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_AES_ARM=y +CONFIG_CRYPTO_AES_ARM_BS=y +CONFIG_CRYPTO_SHA1_ARM=y +CONFIG_CRYPTO_SHA256_ARM=y +CONFIG_CRYPTO_SHA1_ARM_NEON=y +CONFIG_CRYPTO_SHA512_ARM_NEON=y +CONFIG_CRYPTO_SHA512_ARM=y # ARM VExpress CONFIG_ARCH_VEXPRESS=y @@ -106,6 +119,8 @@ CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y CONFIG_OF_PCI_IRQ=m CONFIG_OF_PCI=m +# CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCIE_IPROC is not set CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_PM_GENERIC_DOMAINS_OF=y @@ -122,15 +137,6 @@ CONFIG_MAILBOX=y CONFIG_ARM_MHU=m # CONFIG_PL320_MBOX is not set -# HW crypto and rng -CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_AES_ARM=m -# CONFIG_CRYPTO_AES_ARM_BS is not set -CONFIG_CRYPTO_SHA1_ARM=m -CONFIG_CRYPTO_SHA256_ARM=m -CONFIG_CRYPTO_SHA1_ARM_NEON=m -CONFIG_CRYPTO_SHA512_ARM_NEON=m -CONFIG_CRYPTO_SHA512_ARM=m # USB CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD_PLATFORM=m @@ -213,6 +219,7 @@ CONFIG_I2C_MUX_GPIO=m CONFIG_I2C_MUX_PINCTRL=m CONFIG_I2C_MUX_PCA9541=m CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_REG=m # spi CONFIG_SPI_PL022=m @@ -280,6 +287,7 @@ CONFIG_VFIO_AMBA=m # CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_PHY_SAMSUNG_USB2 is not set +# CONFIG_OMAP_GPMC_DEBUG is not set ### turn off things which make no sense on embedded SoC @@ -349,3 +357,6 @@ CONFIG_VFIO_AMBA=m # CONFIG_BMP085_SPI is not set # CONFIG_TI_DAC7512 is not set # CONFIG_SPI_ROCKCHIP is not set + +# https://fedoraproject.org/wiki/Features/Checkpoint_Restore +CONFIG_CHECKPOINT_RESTORE=y |