From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mike Rapoport <rppt@kernel.org>,
Mike Rapoport <rppt@linux.ibm.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm64 tree
Date: Mon, 22 Mar 2021 18:03:29 +0000 [thread overview]
Message-ID: <20210322180329.GA12107@arm.com> (raw)
In-Reply-To: <20210322174023.602a110b@canb.auug.org.au>
On Mon, Mar 22, 2021 at 05:40:23PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/arm64/mm/mmu.c
>
> between commit:
>
> 87143f404f33 ("arm64: mm: use XN table mapping attributes for the linear region")
>
> from the arm64 tree and commit:
>
> 0a2634348ef8 ("set_memory: allow querying whether set_direct_map_*() is actually enabled")
>
> from the akpm tree.
>
> I fixed it up (see below) 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.
The resolution looks fine. Thanks Stephen.
--
Catalin
next prev parent reply other threads:[~2021-03-22 18:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 6:40 linux-next: manual merge of the akpm tree with the arm64 tree Stephen Rothwell
2021-03-22 18:03 ` Catalin Marinas [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 9:25 Stephen Rothwell
2021-06-07 10:29 ` Will Deacon
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=20210322180329.GA12107@arm.com \
--to=catalin.marinas@arm.com \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
--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).