On 02/15/2018 11:14 AM, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
>
> The patch below does not apply to the 4.15-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
You can apply it cleanly if you apply b8fe1120b4ba342b4f156d24e952d6e686b20298 ("lib/ubsan.c: s/missaligned/misaligned/")
first. That is a simple spelling fix in a function name, which caused this conflict.
Or I can resolve the conflict and send you the backport. What would you prefer?
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 42440c1f9911b4b7b8ba3dc4e90c1197bc561211 Mon Sep 17 00:00:00 2001
> From: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
> Date: Tue, 6 Feb 2018 15:40:42 -0800
> Subject: [PATCH] lib/ubsan: add type mismatch handler for new GCC/Clang
>