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>,
Vincenzo Frascino <vincenzo.frascino@arm.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the arm64 tree
Date: Fri, 8 Oct 2021 08:37:12 +0100 [thread overview]
Message-ID: <20211008073711.GC32625@willie-the-truck> (raw)
In-Reply-To: <20211008170420.4044df3a@canb.auug.org.au>
On Fri, Oct 08, 2021 at 05:04:20PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/kernel/mte.c
> mm/kasan/kasan.h
> mm/kasan/hw_tags.c
>
> between commit:
>
> ec0288369f0c ("arm64: mte: Add asymmetric mode support")
>
> from the arm64 tree and commit:
>
> 7f3c6cb1e524 ("arm64: mte: add asymmetric mode support")
>
> from the akpm-current tree.
>
> I am assuming that the arm64 tree commit (and surrounding commits) is
> a newer version of the same change in the akpm-current tree, so I have
> dropped the following patches from the akpm-current tree.
Thanks, that's the right thing to do.
Will
next prev parent reply other threads:[~2021-10-08 7:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 6:04 linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2021-10-08 7:37 ` Will Deacon [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-13 8:59 Stephen Rothwell
2021-04-13 9:14 ` Catalin Marinas
2020-12-03 8:06 Stephen Rothwell
2020-12-03 11:16 ` Catalin Marinas
2020-09-21 8:03 Stephen Rothwell
2020-09-21 8:12 ` Catalin Marinas
2020-10-13 7:34 ` Stephen Rothwell
2020-07-16 8:00 Stephen Rothwell
2020-07-16 8:23 ` Will Deacon
2020-04-30 6:26 Stephen Rothwell
2020-04-29 6:53 Stephen Rothwell
2019-08-07 6:39 Stephen Rothwell
2018-12-13 6:01 Stephen Rothwell
2018-12-13 11:12 ` Will Deacon
2018-12-11 6:11 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2018-12-11 6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2018-12-11 10:39 ` Will Deacon
2018-12-11 6:02 Stephen Rothwell
2018-09-24 4:38 Stephen Rothwell
2018-09-24 9:32 ` Catalin Marinas
2018-07-27 10:55 Stephen Rothwell
2018-08-16 0:11 ` Stephen Rothwell
2017-11-06 5:33 Stephen Rothwell
2016-09-27 6:03 Stephen Rothwell
2016-06-22 4:54 Stephen Rothwell
2015-12-16 5:01 Stephen Rothwell
2015-12-16 10:14 ` Will Deacon
2014-09-23 7:23 Stephen Rothwell
2014-09-23 8:36 ` Catalin Marinas
2014-07-24 8:42 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=20211008073711.GC32625@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=sfr@canb.auug.org.au \
--cc=vincenzo.frascino@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.