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
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

Test: Built and booted against cuttlefish
Change-Id: I987fc544b566efb383a669da74309a76d5b53c0f
Signed-off-by: Alistair Strachan <>
2 files changed