On Mon, Nov 30, 2020 at 06:48:35PM +1100, Stephen Rothwell wrote:
> On Mon, 30 Nov 2020 18:28:40 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.
Thanks Stephen. While the conflicts are not too bad, the variable
renaming (e.g. gcr_incl -> gcr_excl) makes them look pretty messy. I'll
drop commit e710c29e0177 and the subsequent one from the arm64 tree and
either merge them via akpm or defer to 5.12.
--
Catalin
