When trying to build linux-next at commit 088c04f5bc33 ("CHROMIUM: Normalize defconfig"), both scarlet and elm fail with the following errors:

chromeos-kernel-next-4.19_rc6-r13: ../../../../../tmp/portage/sys-kernel/chromeos-kernel-next-4.19_rc6-r13/work/chromeos-kernel-next-4.19_rc6/drivers/md/dm-verity-chromeos.c: In function 'chromeos_invalidate_kernel_nand':
chromeos-kernel-next-4.19_rc6-r13: ../../../../../tmp/portage/sys-kernel/chromeos-kernel-next-4.19_rc6-r13/work/chromeos-kernel-next-4.19_rc6/drivers/md/dm-verity-chromeos.c:282:13: error: 'struct erase_info' has no member named 'mtd'
chromeos-kernel-next-4.19_rc6-r13:   erase.instr.mtd = dev;
chromeos-kernel-next-4.19_rc6-r13:              ^
chromeos-kernel-next-4.19_rc6-r13: ../../../../../tmp/portage/sys-kernel/chromeos-kernel-next-4.19_rc6-r13/work/chromeos-kernel-next-4.19_rc6/drivers/md/dm-verity-chromeos.c:285:13: error: 'struct erase_info' has no member named 'callback'
chromeos-kernel-next-4.19_rc6-r13:   erase.instr.callback = complete_erase;
chromeos-kernel-next-4.19_rc6-r13:              ^
chromeos-kernel-next-4.19_rc6-r13: ../../../../../tmp/portage/sys-kernel/chromeos-kernel-next-4.19_rc6-r13/work/chromeos-kernel-next-4.19_rc6/drivers/md/dm-verity-chromeos.c:291:17: error: 'struct erase_info' has no member named 'state'
chromeos-kernel-next-4.19_rc6-r13:   if (erase.instr.state == MTD_ERASE_FAILED) {
chromeos-kernel-next-4.19_rc6-r13:                  ^
chromeos-kernel-next-4.19_rc6-r13: ../../../../../tmp/portage/sys-kernel/chromeos-kernel-next-4.19_rc6-r13/work/chromeos-kernel-next-4.19_rc6/drivers/md/dm-verity-chromeos.c:291:27: error: 'MTD_ERASE_FAILED' undeclared (first use in this function)
chromeos-kernel-next-4.19_rc6-r13:   if (erase.instr.state == MTD_ERASE_FAILED) {
chromeos-kernel-next-4.19_rc6-r13: