tag ec5f90bb26354cad19570ab5acdc3230e00fe945
tagger Todd Kjos <tkjos@google.com> Fri Mar 22 10:13:31 2019 -0700
object ab1b6215975e3fbb8b1ecb41fa1098793e6fb2d2

android-mainline-tracking branch @ 5.0

Dropped these patches as part of rebase to 5.0:

Revert "x86: Allow generating user-space headers without a compiler"
Revert "x86: Force asm-goto"
ANDROID: x86: Remove a useless warning message
ANDROID: cpuset: Make cpusets restore on hotplug

commit ab1b6215975e3fbb8b1ecb41fa1098793e6fb2d2
author Alistair Strachan <astrachan@google.com> Mon Mar 18 16:48:04 2019 -0700
committer Amit Pundir <amit.pundir@linaro.org> Wed Mar 20 13:58:39 2019 +0530
tree a09d97c5eed72600329c6d0b1695c7fe4f5afbe1
parent 505dfd10128d12f8e2af0b9a01b7666a6c6056a1

ANDROID: cuttlefish_defconfig: Refresh configs

Upstream, the CONFIG_SCSI_MQ_DEFAULT option has been removed, and
CONFIG_PCI was changed to 'default n', which breaks cuttlefish. This
also fixes the CONFIG_FS_ENCRYPTION options which were consolidated
upstream.

Test: Built and booted against cuttlefish
Change-Id: I987fc544b566efb383a669da74309a76d5b53c0f
Signed-off-by: Alistair Strachan <astrachan@google.com>