From: Will Deacon <will@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peter Collingbourne <pcc@google.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm64 tree
Date: Mon, 7 Jun 2021 11:29:33 +0100 [thread overview]
Message-ID: <20210607102932.GA6924@willie-the-truck> (raw)
In-Reply-To: <20210607192513.466770c0@canb.auug.org.au>
On Mon, Jun 07, 2021 at 07:25:13PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/include/asm/page.h
>
> between commits:
>
> 92638b4e1b47 ("mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable()")
> 7a3b83537188 ("kasan: use separate (un)poison implementation for integrated init")
> 013bb59dbb7c ("arm64: mte: handle tags zeroing at page allocation time")
> c275c5c6d50a ("kasan: disable freed user page poisoning with HW tags")
>
> from the arm64 tree and (more or less) duplicated patches in the akpm tree.
>
> I fixed it up (I dropped the patches form the akpm tree) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging. You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.
Thanks, Stephen.
Andrew -- you can drop your copies of these patches, as you suggested at:
https://lore.kernel.org/r/20210603200308.2a08d25db0dc92430a545b4c@linux-foundation.org
Will
next prev parent reply other threads:[~2021-06-07 10:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 9:25 linux-next: manual merge of the akpm tree with the arm64 tree Stephen Rothwell
2021-06-07 10:29 ` Will Deacon [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-22 6:40 Stephen Rothwell
2021-03-22 18:03 ` Catalin Marinas
2021-01-28 8:08 Stephen Rothwell
2020-11-30 7:28 Stephen Rothwell
2020-11-30 7:48 ` Stephen Rothwell
2020-11-30 11:58 ` Catalin Marinas
2020-11-26 7:06 Stephen Rothwell
2020-11-26 7:25 ` Peter Collingbourne
2020-03-05 5:50 Stephen Rothwell
2020-03-05 9:21 ` Catalin Marinas
2020-01-23 5:43 Stephen Rothwell
2017-04-07 7:41 Stephen Rothwell
2017-04-07 8:48 ` Catalin Marinas
2017-04-07 9:25 ` Stephen Rothwell
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=20210607102932.GA6924@willie-the-truck \
--to=will@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pcc@google.com \
--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;
as well as URLs for NNTP newsgroup(s).