From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chengming Zhou <zhouchengming@bytedance.com>,
Joel Savitz <jsavitz@redhat.com>,
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 akpm tree with the mm-hotfixes tree
Date: Tue, 10 May 2022 09:56:08 -0700 [thread overview]
Message-ID: <20220510095608.41b0f63a41a5e7f76c1fa187@linux-foundation.org> (raw)
In-Reply-To: <20220510223530.67d9a27f@canb.auug.org.au>
On Tue, 10 May 2022 22:35:30 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the akpm tree got a conflict in:
>
> tools/testing/selftests/vm/Makefile
>
> between commit:
>
> e33ebf536f3e ("selftests: vm: Makefile: rename TARGETS to VMTARGETS")
>
> from the mm-hotfixes tree and patch:
>
> "kselftest/vm: override TARGETS from arguments"
>
> from the akpm tree.
Thanks. Let's just drop
kselftest-vm-override-targets-from-arguments.patch for now - a new
version is in the works.
next prev parent reply other threads:[~2022-05-10 16:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 12:35 linux-next: manual merge of the akpm tree with the mm-hotfixes tree Stephen Rothwell
2022-05-10 16:56 ` Andrew Morton [this message]
2022-05-10 22:35 ` Stephen Rothwell
2022-05-11 2:38 ` [External] " Chengming Zhou
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=20220510095608.41b0f63a41a5e7f76c1fa187@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=jsavitz@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=zhouchengming@bytedance.com \
/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;
as well as URLs for NNTP newsgroup(s).