mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kees Cook <keescook@chromium.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kspp tree with the mm tree
Date: Thu, 22 Feb 2024 09:11:31 -0800	[thread overview]
Message-ID: <20240222091131.5a85973927496f49af32123a@linux-foundation.org> (raw)
In-Reply-To: <20240222164112.20c5646e@canb.auug.org.au>

On Thu, 22 Feb 2024 16:41:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the kspp tree got conflicts in:
> 
>   scripts/Makefile.lib
>   scripts/Makefile.ubsan
> 
> between commit:
> 
>   1a75e5856b3b ("ubsan: reintroduce signed overflow sanitizer")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
> 
> from the kspp tree.

Thanks, I'll drop the mm.git copy.

  reply	other threads:[~2024-02-22 17:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22  5:41 Stephen Rothwell
2024-02-22 17:11 ` Andrew Morton [this message]
2024-08-29  5:31 Stephen Rothwell
2024-08-29  8:12 ` Hongbo Li

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=20240222091131.5a85973927496f49af32123a@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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
all inboxes | Powered by JetHome®