From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Cc: Andrey Konovalov <andreyknvl@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Peter Collingbourne <pcc@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm64 tree
Date: Mon, 30 Nov 2020 18:48:35 +1100 [thread overview]
Message-ID: <20201130184835.18b5f4de@canb.auug.org.au> (raw)
In-Reply-To: <20201130182840.02a96a67@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1013 bytes --]
Hi all,
On Mon, 30 Nov 2020 18:28:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/arm64/kernel/mte.c
>
> between commit:
>
> e710c29e0177 ("arm64: mte: make the per-task SCTLR_EL1 field usable elsewhere")
>
> from the arm64 tree and commit:
>
> 44a7127eb3a4 ("arm64: mte: add in-kernel MTE helpers")
>
> from the akpm tree.
>
> I fixed it up (the former just removed some of the context for what the
> latter added) 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.
A couple of the following patches in the akpm tree also conflicted with
the arm64 tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-11-30 7:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 7:28 linux-next: manual merge of the akpm tree with the arm64 tree Stephen Rothwell
2020-11-30 7:48 ` Stephen Rothwell [this message]
2020-11-30 11:58 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 9:25 Stephen Rothwell
2021-06-07 10:29 ` Will Deacon
2021-03-22 6:40 Stephen Rothwell
2021-03-22 18:03 ` Catalin Marinas
2021-01-28 8:08 Stephen Rothwell
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=20201130184835.18b5f4de@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pcc@google.com \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
/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).