On Wed, Jan 13, 2021 at 12:51:07PM -0500, Sasha Levin wrote:

On Mon, Jan 11, 2021 at 03:41:37PM -0800, Nick Desaulniers wrote:

...

Please consider applying the following patch for LLVM_IAS=1 support for Android's i386 cuttlefish virtual device: commit 78762b0e79bc ("x86/asm/32: Add ENDs to some functions and relabel with SYM_CODE_*") which first landed in v5.5-rc1.

There was a small conflict in arch/x86/xen/xen-asm_32.S due to the order of backports that was trivial to resolve. You can see the list of commits to it in linux-5.7.y: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/arch/x8... as arch/x86/xen/xen-asm_32.S was removed in commit a13f2ef168cb ("x86/xen: remove 32-bit Xen PV guest support") in v5.9-rc1.

Queued up, thanks!

You stripped out the "commit XXX upstream" line from the patch :(

I've fixed that up now.

thanks,

greg k-h