Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/arm64/mm/mmu.c
between commit:
bbd6ec605c0f ("arm64/mm: Enable memory hot remove")
from the arm64 tree and patch:
37be0f08b1cc ("arm64/mm: implement unmap_hotplug_p4d_range")
from the akpm tree.
I fixed it up (I just dropped the latter (and its followup fix) for today)
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.
--
Cheers,
Stephen Rothwell
On Thu, Mar 05, 2020 at 04:50:46PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/arm64/mm/mmu.c
>
> between commit:
>
> bbd6ec605c0f ("arm64/mm: Enable memory hot remove")
>
> from the arm64 tree and patch:
>
> 37be0f08b1cc ("arm64/mm: implement unmap_hotplug_p4d_range")
>
> from the akpm tree.
>
> I fixed it up (I just dropped the latter (and its followup fix) for today)
Thanks Stephen. Anshuman integrated those fixes in his memory hotremove
series.
--
Catalin
On Wed, Nov 25, 2020 at 11:06 PM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/arm64/mm/proc.S
>
> between commit:
>
> 49b3cf035edc ("kasan: arm64: set TCR_EL1.TBID1 when enabled")
>
> from the arm64 tree and commit:
>
> 68cd215d6529 ("arm64: kasan: allow enabling in-kernel MTE")
>
> from the akpm tree.
>
> I fixed it up (I think, 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/mm/proc.S
> index a0831bf8a018,0d85e6df42bc..000000000000
> --- a/arch/arm64/mm/proc.S
> +++ b/arch/arm64/mm/proc.S
> @@@ -40,9 -40,15 +40,15 @@@
> #define TCR_CACHE_FLAGS TCR_IRGN_WBWA | TCR_ORGN_WBWA
>
> #ifdef CONFIG_KASAN_SW_TAGS
> - #define TCR_KASAN_FLAGS TCR_TBI1 | TCR_TBID1
> -#define TCR_KASAN_SW_FLAGS TCR_TBI1
> ++#define TCR_KASAN_SW_FLAGS TCR_TBI1 | TCR_TBID1
> #else
> - #define TCR_KASAN_FLAGS 0
> + #define TCR_KASAN_SW_FLAGS 0
> + #endif
> +
> + #ifdef CONFIG_KASAN_HW_TAGS
> -#define TCR_KASAN_HW_FLAGS SYS_TCR_EL1_TCMA1 | TCR_TBI1
> ++#define TCR_KASAN_HW_FLAGS SYS_TCR_EL1_TCMA1 | TCR_TBI1 | TCR_TBID1
> + #else
> + #define TCR_KASAN_HW_FLAGS 0
> #endif
>
> /*
Thanks Stephen, that resolution looks correct to me.
Peter