From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
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: Wed, 11 May 2022 08:35:42 +1000 [thread overview]
Message-ID: <20220511083542.7f175f4b@canb.auug.org.au> (raw)
In-Reply-To: <20220510095608.41b0f63a41a5e7f76c1fa187@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
Hi Andrew,
On Tue, 10 May 2022 09:56:08 -0700 Andrew Morton <akpm@linux-foundation•org> wrote:
>
> 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.
OK, done.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-05-10 22:35 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
2022-05-10 22:35 ` Stephen Rothwell [this message]
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=20220511083542.7f175f4b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jsavitz@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=zhouchengming@bytedance$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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