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>,
Mark Brown <broonie@kernel.org>,
Suren Baghdasaryan <surenb@google.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the mm tree
Date: Mon, 28 Oct 2024 17:25:34 +0000 [thread overview]
Message-ID: <Zx_JDg9e61KKan3H@arm.com> (raw)
In-Reply-To: <20241028111058.4419a9ed@canb.auug.org.au>
On Mon, Oct 28, 2024 at 11:10:58AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> include/linux/mm.h
>
> between commit:
>
> e87ec503cf2e ("mm/codetag: uninline and move pgalloc_tag_copy and pgalloc_tag_split")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 91e102e79740 ("prctl: arch-agnostic prctl for shadow stack")
>
> 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.
This looks fine. Thanks.
--
Catalin
next prev parent reply other threads:[~2024-10-28 17:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-28 0:10 linux-next: manual merge of the arm64 tree with the mm tree Stephen Rothwell
2024-10-28 17:25 ` Catalin Marinas [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2024-10-23 23:37 Stephen Rothwell
2024-10-24 8:14 ` Catalin Marinas
2024-11-20 0:58 ` 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=Zx_JDg9e61KKan3H@arm.com \
--to=catalin.marinas@arm.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=surenb@google.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