From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:37256 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755240AbeBOKGf (ORCPT ); Thu, 15 Feb 2018 05:06:35 -0500 Date: Thu, 15 Feb 2018 11:06:35 +0100 From: Greg KH To: Andrey Ryabinin 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 Message-ID: <20180215100635.GA29232@kroah.com> References: <15186824889442@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: stable-owner@vger.kernel.org List-ID: 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 . > > > > 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