linux: Update to v4.2.1-openpower1
This brings in the 4.2.1 stable release, and the accraid RAID driver for
PMC-Sierra RAID on Habanero.
The RAID driver is submitted upstream to the linux-scsi mailing list,
but is not yet in a tree.
The stable release brings in a few commits that are of interest to
OpenPower platforms:
94d718d024e xfs: return errors from partial I/O failures to files
2937b784b19 xfs: Fix file type directory corruption for btree directories
95310b79776 libxfs: readahead of dir3 data blocks should use the read verifier
0a3b19cef4f sched: Fix cpu_active_mask/cpu_online_mask race
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index e18eab9..1a80631 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -1,7 +1,5 @@
CONFIG_PPC64=y
CONFIG_ALTIVEC=y
-CONFIG_PPC_POWERNV_RTAS=n
-CONFIG_PPC_PSERIES=n
CONFIG_VSX=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2048
@@ -9,8 +7,7 @@
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
-CONFIG_AUDIT=n
-CONFIG_AUDITSYSCALL=n
+# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_IRQ_DOMAIN_DEBUG=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
@@ -21,9 +18,14 @@
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=20
-# CONFIG_NAMESPACES is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_KALLSYMS_ALL=y
CONFIG_PERF_EVENTS=y
# CONFIG_COMPAT_BRK is not set
@@ -31,6 +33,8 @@
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_PPC_PSERIES is not set
# CONFIG_PPC_PMAC is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_HZ_100=y
@@ -39,16 +43,14 @@
# CONFIG_COMPACTION is not set
# CONFIG_MIGRATION is not set
# CONFIG_BOUNCE is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_PPC_64K_PAGES=y
CONFIG_SCHED_SMT=y
-# CONFIG_SUSPEND is not set
# CONFIG_SECCOMP is not set
+CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
-CONFIG_NET=y
CONFIG_NET_IPIP=y
CONFIG_SYN_COOKIES=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
@@ -59,12 +61,9 @@
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER_USER_HELPER is not set
-CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_IOSCHED_DEADLINE=n
CONFIG_ATA_OVER_ETH=y
CONFIG_VIRTIO_BLK=y
CONFIG_EEPROM_AT24=y
@@ -73,13 +72,14 @@
CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=y
CONFIG_SCSI_CXGB3_ISCSI=y
CONFIG_SCSI_CXGB4_ISCSI=y
CONFIG_SCSI_BNX2_ISCSI=y
CONFIG_BE2ISCSI=y
+CONFIG_SCSI_AACRAID=y
CONFIG_SCSI_MPT2SAS=y
CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
@@ -92,7 +92,6 @@
CONFIG_SCSI_VIRTIO=y
CONFIG_SCSI_DH=y
CONFIG_SCSI_DH_ALUA=y
-CONFIG_SCSI_FC_ATTRS=y
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
# CONFIG_ATA_SFF is not set
@@ -138,10 +137,8 @@
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_MISC=y
# CONFIG_SERIO_SERPORT is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_HVC_CONSOLE=y
CONFIG_IPMI_HANDLER=y
CONFIG_IPMI_DEVICE_INTERFACE=y
CONFIG_IPMI_POWERNV=y
@@ -178,8 +175,6 @@
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_PCI=y
# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXT2_FS=n
-CONFIG_EXT3_FS=n
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
@@ -205,29 +200,14 @@
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_UTF8=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_DECOMPRESS_LZO=n
-CONFIG_DECOMPRESS_LZ4=n
-CONFIG_DECOMPRESS_GZIP=n
-CONFIG_DECOMPRESS_BZIP2=n
-CONFIG_DECOMPRESS_LZMA=n
-CONFIG_RD_GZIP=n
-CONFIG_RD_BZIP2=n
-CONFIG_RD_LZMA=n
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=n
-CONFIG_RD_LZ4=n
CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
+CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_SCHEDSTATS=y
# CONFIG_FTRACE is not set
-CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_XMON=y
CONFIG_XMON_DEFAULT=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
-CONFIG_CRYPTO_DES=n
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y