Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/kernel/mte.c
mm/kasan/kasan.h
mm/kasan/hw_tags.c
between commit:
ec0288369f0c ("arm64: mte: Add asymmetric mode support")
from the arm64 tree and commit:
7f3c6cb1e524 ("arm64: mte: add asymmetric mode support")
from the akpm-current tree.
I am assuming that the arm64 tree commit (and surrounding commits) is
a newer version of the same change in the akpm-current tree, so I have
dropped the following patches from the akpm-current tree.
2cff25205689 kasan: extend KASAN mode kernel parameter
7f3c6cb1e524 arm64: mte: add asymmetric mode support
a0449eb025b2 arm64: mte: CPU feature detection for Asymm MTE
b7b8a32980f3 arm64: mte: bitfield definitions for Asymm MTE
89a5adeb4891 kasan: remove duplicate of kasan_flag_async
I fixed it up (see above) 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
Attachment:
pgpcAnRTCtdri.pgp
Description: OpenPGP digital signature
