On Thu, Feb 15, 2018 at 12:18:20PM +0300, Andrey Ryabinin wrote:
>
>
> 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?
I've now queued up both patches, thanks for the hint.
greg k-h