Merge "Merge android-4.14.41 (04f740d4) into msm-4.14"

| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220        |

| ARM            | Cortex-A72      | #853709         | N/A                         |

| ARM            | Cortex-A73      | #858921         | ARM64_ERRATUM_858921        |

| ARM            | Cortex-A55      | #1024718        | ARM64_ERRATUM_1024718       |

| ARM            | MMU-500         | #841119,#826419 | N/A                         |

|                |                 |                 |                             |

| Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375        |

# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 39

SUBLEVEL = 41

EXTRAVERSION =

NAME = Petit Gorille

CONFIG_TABLET_USB_HANWANG=y

CONFIG_TABLET_USB_KBTAB=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_KEYCHORD=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=y

# CONFIG_SERIO_SERPORT is not set

	  If unsure, say Y.

config ARM64_ERRATUM_1024718

	bool "Cortex-A55: 1024718: Update of DBM/AP bits without break before make might result in incorrect update"

	default y

	help

	  This option adds work around for Arm Cortex-A55 Erratum 1024718.

	  Affected Cortex-A55 cores (r0p0, r0p1, r1p0) could cause incorrect

	  update of the hardware dirty bit when the DBM/AP bits are updated

	  without a break-before-make. The work around is to disable the usage

	  of hardware DBM locally on the affected cores. CPUs not affected by

	  erratum will continue to use the feature.

	  If unsure, say Y.

config CAVIUM_ERRATUM_22375

	bool "Cavium erratum 22375, 24313"

	default y

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_TABLET=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_KEYCHORD=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=y

# CONFIG_SERIO_SERPORT is not set