From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Will Deacon <will@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Mike Rapoport (Microsoft)" <rppt@kernel.org>,
Steven Price <steven.price@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the mm tree
Date: Thu, 24 Oct 2024 09:14:53 +0100 [thread overview]
Message-ID: <ZxoB_Zu_KNTuO7sE@arm.com> (raw)
In-Reply-To: <20241024103709.082a6950@canb.auug.org.au>
On Thu, Oct 24, 2024 at 10:37:09AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/mm/pageattr.c
>
> between commit:
>
> 040ee4186d6c ("arch: introduce set_direct_map_valid_noflush()")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 42be24a4178f ("arm64: Enable memory encrypt for Realms")
>
> from the arm64 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:[~2024-10-24 8:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 23:37 linux-next: manual merge of the arm64 tree with the mm tree Stephen Rothwell
2024-10-24 8:14 ` Catalin Marinas [this message]
2024-11-20 0:58 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-10-28 0:10 Stephen Rothwell
2024-10-28 17:25 ` Catalin Marinas
2024-10-28 17:47 ` Suren Baghdasaryan
2024-11-20 1:01 ` Stephen Rothwell
2024-11-20 1:09 ` Suren Baghdasaryan
2024-11-20 1:43 ` Suren Baghdasaryan
2024-11-20 2:57 ` Stephen Rothwell
2024-11-20 3:18 ` Suren Baghdasaryan
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=ZxoB_Zu_KNTuO7sE@arm.com \
--to=catalin.marinas@arm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=steven.price@arm.com \
--cc=suzuki.poulose@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 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.