From: Greg KH <gregkh@linuxfoundation.org>
To: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: akpm@linux-foundation.org, psodagud@codeaurora.org,
stable@vger.kernel.org, torvalds@linux-foundation.org
Subject: Re: FAILED: patch "[PATCH] lib/ubsan: add type mismatch handler for new GCC/Clang" failed to apply to 4.15-stable tree
Date: Thu, 15 Feb 2018 11:06:35 +0100 [thread overview]
Message-ID: <20180215100635.GA29232@kroah.com> (raw)
In-Reply-To: <ce3f3087-defa-bc96-8a20-0ebb23f6f112@virtuozzo.com>
On Thu, Feb 15, 2018 at 12:18:20PM +0300, Andrey Ryabinin wrote:
>
>
> On 02/15/2018 11:14 AM, gregkh@linuxfoundation.org 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@vger.kernel.org>.
> >
>
> 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
prev parent reply other threads:[~2018-02-15 10:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-15 8:14 FAILED: patch "[PATCH] lib/ubsan: add type mismatch handler for new GCC/Clang" failed to apply to 4.15-stable tree gregkh
2018-02-15 9:18 ` Andrey Ryabinin
2018-02-15 10:06 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180215100635.GA29232@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=psodagud@codeaurora.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox